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

commit 239d4798dfeee56d5b6feb44060a086c88e00557
Author: Charles Harrison <csharrison@chromium.org>
Date: Tue Jun 13 03:54:17 2017

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 <csharrison@chromium.org>
Reviewed-by: Martin Šrámek <msramek@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: Lucas Garron <lgarron@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#478894}
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/android/java/src/org/chromium/chrome/browser/page_info/PageInfoPopup.java
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/android/preferences/pref_service_bridge.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/android/preferences/website_preference_bridge.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/content_settings/tab_specific_content_settings.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/subresource_filter/subresource_filter_content_settings_manager_unittest.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/ui/android/page_info/page_info_popup_android.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/ui/chrome_pages.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/ui/content_settings/content_setting_image_model.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/ui/page_info/page_info.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/ui/page_info/page_info_ui.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/ui/page_info/page_info_unittest.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/ui/page_info/permission_menu_model.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/ui/page_info/permission_menu_model_unittest.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/ui/views/location_bar/content_setting_bubble_dialog_browsertest.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/chrome/browser/ui/webui/site_settings_helper.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/components/content_settings/core/browser/content_settings_default_provider.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/components/content_settings/core/browser/content_settings_registry.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/components/content_settings/core/browser/website_settings_registry.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/components/content_settings/core/common/content_settings.cc
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/components/content_settings/core/common/content_settings_types.h
[modify] https://crrev.com/239d4798dfeee56d5b6feb44060a086c88e00557/tools/metrics/histograms/enums.xml

I don't think this is worth the trouble. But maybe we can re-open if it starts being more annoying.