0

Remove unused ClientHintsControllerDelegate::AreThirdPartyCookiesBlocked

As far as I can see it's no longer needed after
https://chromium-review.googlesource.com/c/chromium/src/+/4551662

Change-Id: I82be271e85852c9a2a44b22f67c0d287b6f60a37
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5920858
Commit-Queue: Maks Orlovich <morlovich@chromium.org>
Reviewed-by: Richard (Torne) Coles <torne@chromium.org>
Reviewed-by: Alexander Timin <altimin@chromium.org>
Reviewed-by: Ari Chivukula <arichiv@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1371438}
This commit is contained in:
Maks Orlovich
2024-10-21 16:21:50 +00:00
committed by Chromium LUCI CQ
parent df068d0fda
commit 0ccb04f985
14 changed files with 0 additions and 82 deletions

@ -134,15 +134,6 @@ bool AwClientHintsControllerDelegate::IsJavaScriptAllowed(
return aw_contents->IsJavaScriptAllowed();
}
bool AwClientHintsControllerDelegate::AreThirdPartyCookiesBlocked(
const GURL& url,
content::RenderFrameHost* rfh) {
// This function is related to an OT for the Sec-CH-UA-Reduced client hint
// and as this doesn't affect WebView at the moment, we have no reason to
// implement it.
return false;
}
blink::UserAgentMetadata
AwClientHintsControllerDelegate::GetUserAgentMetadata() {
return GetUserAgentMetadataOverrideBrand();

@ -64,9 +64,6 @@ class AwClientHintsControllerDelegate
bool IsJavaScriptAllowed(const GURL& url,
content::RenderFrameHost* parent_rfh) override;
bool AreThirdPartyCookiesBlocked(const GURL& url,
content::RenderFrameHost* rfh) override;
blink::UserAgentMetadata GetUserAgentMetadata() override;
void PersistClientHints(const url::Origin& primary_origin,

@ -103,13 +103,6 @@ TEST_F(AwClientHintsControllerDelegateTest, IsJavaScriptAllowed) {
GURL("https://example.com/"), nullptr));
}
TEST_F(AwClientHintsControllerDelegateTest, AreThirdPartyCookiesBlocked) {
EXPECT_FALSE(client_hints_controller_delegate_->AreThirdPartyCookiesBlocked(
GURL(""), nullptr));
EXPECT_FALSE(client_hints_controller_delegate_->AreThirdPartyCookiesBlocked(
GURL("https://example.com"), nullptr));
}
TEST_F(AwClientHintsControllerDelegateTest, GetUserAgentMetadata) {
auto metadata = client_hints_controller_delegate_->GetUserAgentMetadata();

@ -149,11 +149,6 @@ bool ClientHints::IsJavaScriptAllowed(const GURL& url,
url, ContentSettingsType::JAVASCRIPT) != CONTENT_SETTING_BLOCK;
}
bool ClientHints::AreThirdPartyCookiesBlocked(const GURL& url,
content::RenderFrameHost* rfh) {
return !cookie_settings_->IsThirdPartyAccessAllowed(url);
}
blink::UserAgentMetadata ClientHints::GetUserAgentMetadata() {
return embedder_support::GetUserAgentMetadata(pref_service_);
}

@ -49,9 +49,6 @@ class ClientHints : public KeyedService,
bool IsJavaScriptAllowed(const GURL& url,
content::RenderFrameHost* parent_rfh) override;
bool AreThirdPartyCookiesBlocked(const GURL& url,
content::RenderFrameHost* rfh) override;
blink::UserAgentMetadata GetUserAgentMetadata() override;
void PersistClientHints(const url::Origin& primary_origin,

@ -16,13 +16,9 @@ namespace client_hints {
InMemoryClientHintsControllerDelegate::InMemoryClientHintsControllerDelegate(
network::NetworkQualityTracker* network_quality_tracker,
base::RepeatingCallback<bool(const GURL&)> is_javascript_allowed_callback,
base::RepeatingCallback<bool(const GURL&)>
are_third_party_cookies_blocked_callback,
blink::UserAgentMetadata user_agent_metadata)
: network_quality_tracker_(network_quality_tracker),
is_javascript_allowed_callback_(is_javascript_allowed_callback),
are_third_party_cookies_blocked_callback_(
are_third_party_cookies_blocked_callback),
user_agent_metadata_(user_agent_metadata) {}
InMemoryClientHintsControllerDelegate::
@ -92,12 +88,6 @@ bool InMemoryClientHintsControllerDelegate::IsJavaScriptAllowed(
return is_javascript_allowed_callback_.Run(url);
}
bool InMemoryClientHintsControllerDelegate::AreThirdPartyCookiesBlocked(
const GURL& url,
content::RenderFrameHost* rfh) {
return are_third_party_cookies_blocked_callback_.Run(url);
}
blink::UserAgentMetadata
InMemoryClientHintsControllerDelegate::GetUserAgentMetadata() {
return user_agent_metadata_;

@ -39,8 +39,6 @@ class InMemoryClientHintsControllerDelegate final
InMemoryClientHintsControllerDelegate(
network::NetworkQualityTracker* network_quality_tracker,
base::RepeatingCallback<bool(const GURL&)> is_javascript_allowed_callback,
base::RepeatingCallback<bool(const GURL&)>
are_third_party_cookies_blocked_callback,
blink::UserAgentMetadata user_agent_metadata);
~InMemoryClientHintsControllerDelegate() override;
@ -63,8 +61,6 @@ class InMemoryClientHintsControllerDelegate final
network::NetworkQualityTracker* GetNetworkQualityTracker() override;
bool IsJavaScriptAllowed(const GURL& url,
content::RenderFrameHost* parent_rfh) override;
bool AreThirdPartyCookiesBlocked(const GURL& url,
content::RenderFrameHost* rfh) override;
blink::UserAgentMetadata GetUserAgentMetadata() override;
void SetMostRecentMainFrameViewportSize(
const gfx::Size& viewport_size) override;
@ -89,10 +85,6 @@ class InMemoryClientHintsControllerDelegate final
// Callback to determine whether JavaScript is enabled for an URL.
base::RepeatingCallback<bool(const GURL&)> is_javascript_allowed_callback_;
// Callback to determine whether third-party cookies are blocked for an URL.
base::RepeatingCallback<bool(const GURL&)>
are_third_party_cookies_blocked_callback_;
const blink::UserAgentMetadata user_agent_metadata_;
// This stores the viewport size of the most recent visible main frame tree

@ -47,11 +47,6 @@ class CONTENT_EXPORT ClientHintsControllerDelegate {
virtual bool IsJavaScriptAllowed(const GURL& url,
RenderFrameHost* parent_rfh) = 0;
// Returns true iff cookies are blocked for the URL/RFH or third-party cookies
// are disabled in the user agent.
virtual bool AreThirdPartyCookiesBlocked(const GURL& url,
RenderFrameHost* rfh) = 0;
virtual blink::UserAgentMetadata GetUserAgentMetadata() = 0;
virtual void PersistClientHints(

@ -39,9 +39,6 @@ class MockClientHintsControllerDelegate : public ClientHintsControllerDelegate {
bool IsJavaScriptAllowed(const GURL& url,
content::RenderFrameHost* parent_rfh) override;
bool AreThirdPartyCookiesBlocked(const GURL& url,
content::RenderFrameHost* rfh) override;
blink::UserAgentMetadata GetUserAgentMetadata() override;
void PersistClientHints(
const url::Origin& primary_origin,

@ -57,12 +57,6 @@ bool MockClientHintsControllerDelegate::IsJavaScriptAllowed(
return true;
}
bool MockClientHintsControllerDelegate::AreThirdPartyCookiesBlocked(
const GURL& url,
content::RenderFrameHost* rfh) {
return false;
}
blink::UserAgentMetadata
MockClientHintsControllerDelegate::GetUserAgentMetadata() {
return metadata_;

@ -185,12 +185,6 @@ base::RepeatingCallback<bool(const GURL&)> IsJavaScriptAllowedCallback() {
return base::BindRepeating([](const GURL&) { return true; });
}
base::RepeatingCallback<bool(const GURL&)>
AreThirdPartyCookiesBlockedCallback() {
// WebEngine does not provide a way to block third-party cookies.
return base::BindRepeating([](const GURL&) { return false; });
}
WebEngineBrowserContext::WebEngineBrowserContext(
base::FilePath data_directory,
network::NetworkQualityTracker* network_quality_tracker)
@ -199,7 +193,6 @@ WebEngineBrowserContext::WebEngineBrowserContext(
simple_factory_key_(GetPath(), IsOffTheRecord()),
client_hints_delegate_(network_quality_tracker,
IsJavaScriptAllowedCallback(),
AreThirdPartyCookiesBlockedCallback(),
embedder_support::GetUserAgentMetadata()),
reduce_accept_language_delegate_(GetAcceptLanguages()) {
SimpleKeyMap::GetInstance()->Associate(this, &simple_factory_key_);

@ -63,13 +63,6 @@ bool HeadlessClientHintsControllerDelegate::IsJavaScriptAllowed(
return true;
}
// TODO(crbug.com/40257952): Currently always returns false.
bool HeadlessClientHintsControllerDelegate::AreThirdPartyCookiesBlocked(
const GURL& url,
content::RenderFrameHost* rfh) {
return false;
}
blink::UserAgentMetadata
HeadlessClientHintsControllerDelegate::GetUserAgentMetadata() {
return HeadlessBrowser::GetUserAgentMetadata();

@ -53,9 +53,6 @@ class HEADLESS_EXPORT HeadlessClientHintsControllerDelegate
bool IsJavaScriptAllowed(const GURL& url,
content::RenderFrameHost* parent_rfh) override;
bool AreThirdPartyCookiesBlocked(const GURL& url,
content::RenderFrameHost* rfh) override;
blink::UserAgentMetadata GetUserAgentMetadata() override;
void PersistClientHints(

@ -17,12 +17,6 @@ TEST(HeadlessClientHintsControllerDelegateTests, GetNetworkQualityTracker) {
EXPECT_EQ(delegate.GetNetworkQualityTracker(), nullptr);
}
TEST(HeadlessClientHintsControllerDelegateTests, AreThirdPartyCookiesBlocked) {
HeadlessClientHintsControllerDelegate delegate;
EXPECT_FALSE(delegate.AreThirdPartyCookiesBlocked(GURL("https://example.com"),
nullptr));
}
TEST(HeadlessClientHintsControllerDelegateTests, PersistentClientHints) {
HeadlessClientHintsControllerDelegate delegate;
auto kOrigin = url::Origin::Create(GURL("https://example.com"));