Merge SubresourceFilterExperimentalUI into global flag
The experimental UI flag was used for an iterative launch when we already
had some enforcement turned on (i.e. after SB interstitials).
Now that the experimental UI has shipped, we don't need this
intermediate state. The global feature is left as-is since a kill-switch
is still useful.
Careful note: All of the places where a flag check is _removed_ are
places which are inaccessible with the global flag turned off. All
other places should check the global flag.
Verified via `git grep SubresourceFilterExperimentalUI`
Bug: 846517
Change-Id: I27e81dd384a3d0ee9031e2c526a4246e781e6c05
Reviewed-on: https://chromium-review.googlesource.com/1072557
Commit-Queue: Charlie Harrison <[email protected]>
Reviewed-by: Trent Apted <[email protected]>
Reviewed-by: Bernhard Bauer <[email protected]>
Reviewed-by: Josh Karlin <[email protected]>
Cr-Commit-Position: refs/heads/master@{#563617}diff --git a/chrome/browser/ui/page_info/page_info.cc b/chrome/browser/ui/page_info/page_info.cc
index f1f7210..cfec84c3 100644
--- a/chrome/browser/ui/page_info/page_info.cc
+++ b/chrome/browser/ui/page_info/page_info.cc
@@ -151,7 +151,7 @@
// value when it has been activated on the current origin.
if (info.type == CONTENT_SETTINGS_TYPE_ADS) {
if (!base::FeatureList::IsEnabled(
- subresource_filter::kSafeBrowsingSubresourceFilterExperimentalUI)) {
+ subresource_filter::kSafeBrowsingSubresourceFilter)) {
return false;
}
