[subresource_filter] Add the Content Settings UI for Android

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

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/android/page_info/page_info_popup_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/stl_util.h"
@@ skipping 99 matching lines @@
   // particular order, but only if their value is different from the default.
   std::vector<ContentSettingsType> permissions_to_display;
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_GEOLOCATION);
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_IMAGES);
   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;
 
   for (const auto& permission : permission_info_list) {
     if (base::ContainsValue(permissions_to_display, permission.type)) {
       if (permission.setting != CONTENT_SETTING_DEFAULT) {
         user_specified_settings_to_display[permission.type] =
             permission.setting;
       } else if (permission.type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
@@ skipping 31 matching lines @@
         static_cast<jint>(CONTENT_SETTING_ALLOW));
   }
 
   Java_PageInfoPopup_updatePermissionDisplay(env, popup_jobject_);
 }
 
 // static
 bool PageInfoPopupAndroid::RegisterPageInfoPopupAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }