[subresource_filter] Add the Content Settings UI for Android

chrome/browser/ui/android/page_info/page_info_popup_android.cc

Index: chrome/browser/ui/android/page_info/page_info_popup_android.cc
diff --git a/chrome/browser/ui/android/page_info/page_info_popup_android.cc b/chrome/browser/ui/android/page_info/page_info_popup_android.cc
index 0328fd59aa50d8dae4efad0c26756ce90e2c3d50..b46387fbf701f6a98a58ba79cd871015741c5b36 100644
--- a/chrome/browser/ui/android/page_info/page_info_popup_android.cc
+++ b/chrome/browser/ui/android/page_info/page_info_popup_android.cc
@@ -117,6 +117,7 @@ void PageInfoPopupAndroid::SetPermissionInfo(
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_POPUPS);
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_AUTOPLAY);
+  permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER);

[Ted C, 2017/04/05 17:15:54]

this doesn't need to be conditionally included based on the UI feature right?  I
believe we only show items in the popup if they deviate from the default and in
this case you wouldn't have been able to change it from the default without the
ui turned on so I suspect this is ok.

[Charlie Harrison, 2017/04/05 17:25:17]

Yep this is correct.

 
   std::map<ContentSettingsType, ContentSetting>
       user_specified_settings_to_display;