[subresource_filter] Implement the "Smart" UI on Android

components/content_settings/core/common/content_settings.cc

Index: components/content_settings/core/common/content_settings.cc
diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
index ec1621532d923046acf5d916aaf72ed060168235..c199d7c862c65d93da9055caeaf01955bbca0ab2 100644
--- a/components/content_settings/core/common/content_settings.cc
+++ b/components/content_settings/core/common/content_settings.cc
@@ -22,6 +22,8 @@ ContentSetting IntToContentSetting(int content_setting) {
 // ContentType enum in histograms.xml.
 // TODO(raymes): We should use a sparse histogram here on the hash of the
 // content settings type name instead.
+// TODO(raymes): This has become out of sync with histograms.xml. See
+// crbug.com/697234.
 ContentSettingsType kHistogramOrder[] = {
     CONTENT_SETTINGS_TYPE_COOKIES,
     CONTENT_SETTINGS_TYPE_IMAGES,
@@ -60,6 +62,7 @@ ContentSettingsType kHistogramOrder[] = {
     CONTENT_SETTINGS_TYPE_IMPORTANT_SITE_INFO,
     CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA,
     CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER,
+    CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER_DATA,

[raymes, 2017/04/12 22:35:15]

Could you please omit this for now until I've landed
https://codereview.chromium.org/2728303002/ ? I can add it afterwards.

[Charlie Harrison, 2017/04/13 03:41:30]

Done.

 };
 
 int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting,