s/CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER/CONTENT_SETTINGS_TYPE_ADS/
The initial patch is just a find and replace followed by "git cl format"
Note that this find and replace also covers our website setting which
is renamed to CONTENT_SETTINGS_TYPE_ADS_DATA.
Bug: 730116
Change-Id: I0c40f7b6e036b0b44204ee03555449f6d08c0506
Reviewed-on: https://chromium-review.googlesource.com/526413
Commit-Queue: Charlie Harrison <[email protected]>
Reviewed-by: Martin Šrámek <[email protected]>
Reviewed-by: Jochen Eisinger <[email protected]>
Reviewed-by: Lucas Garron <[email protected]>
Reviewed-by: Bernhard Bauer <[email protected]>
Cr-Commit-Position: refs/heads/master@{#478894}diff --git a/chrome/browser/ui/page_info/page_info.cc b/chrome/browser/ui/page_info/page_info.cc
index e14edf1..a0e2e5d4 100644
--- a/chrome/browser/ui/page_info/page_info.cc
+++ b/chrome/browser/ui/page_info/page_info.cc
@@ -107,7 +107,7 @@
CONTENT_SETTINGS_TYPE_IMAGES,
#endif
CONTENT_SETTINGS_TYPE_POPUPS,
- CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER,
+ CONTENT_SETTINGS_TYPE_ADS,
CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,
CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
CONTENT_SETTINGS_TYPE_AUTOPLAY,
@@ -125,7 +125,7 @@
return false;
#endif
- if (type == CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER) {
+ if (type == CONTENT_SETTINGS_TYPE_ADS) {
if (!base::FeatureList::IsEnabled(
subresource_filter::kSafeBrowsingSubresourceFilterExperimentalUI)) {
return false;
@@ -134,8 +134,8 @@
// The setting for subresource filtering should not show up if the site is
// not activated, both on android and desktop platforms.
return content_settings->GetWebsiteSetting(
- site_url, GURL(), CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER_DATA,
- std::string(), nullptr) != nullptr;
+ site_url, GURL(), CONTENT_SETTINGS_TYPE_ADS_DATA, std::string(),
+ nullptr) != nullptr;
}
return true;
