The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b73f762c7e12ba407b01752bec5dffc48b5925d9

commit b73f762c7e12ba407b01752bec5dffc48b5925d9
Author: Charlie Harrison <csharrison@chromium.org>
Date: Fri Jun 01 14:24:34 2018

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 <csharrison@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Josh Karlin <jkarlin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#563617}
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/android/javatests/src/org/chromium/chrome/browser/SubresourceFilterTest.java
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/app/generated_resources.grd
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/browser/android/chrome_feature_list.cc
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/browser/subresource_filter/chrome_subresource_filter_client.h
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/browser/subresource_filter/subresource_filter_content_settings_manager_unittest.cc
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/browser/subresource_filter/subresource_filter_test_harness.cc
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/browser/subresource_filter/subresource_filter_test_harness.h
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/browser/ui/android/content_settings/ads_blocked_infobar_delegate.cc
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_browsertest.mm
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/browser/ui/page_info/page_info.cc
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/browser/ui/page_info/page_info_unittest.cc
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/chrome/browser/ui/webui/site_settings_helper.cc
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/components/subresource_filter/core/browser/subresource_filter_features.cc
[modify] https://crrev.com/b73f762c7e12ba407b01752bec5dffc48b5925d9/components/subresource_filter/core/browser/subresource_filter_features.h