[subresource_filter] Always display the default setting in Android Page Info

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 90 matching lines @@
   NOTIMPLEMENTED();
 }
 
 void PageInfoPopupAndroid::SetPermissionInfo(
     const PermissionInfoList& permission_info_list,
     ChosenObjectInfoList chosen_object_info_list) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   // On Android, we only want to display a subset of the available options in a
   // particular order, but only if their value is different from the default.
+  // This order comes from https://crbug.com/610358.
   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_SUBRESOURCE_FILTER);
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_AUTOPLAY);
-  permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER);
 
   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) {
+      base::Optional<ContentSetting> setting_to_display =
+          GetSettingToDisplay(permission);
+      if (setting_to_display) {
         user_specified_settings_to_display[permission.type] =
-            permission.setting;
-      } else if (permission.type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
-        if (search_geolocation_service_ &&
-            search_geolocation_service_->UseDSEGeolocationSetting(
-                url::Origin(url_))) {
-          user_specified_settings_to_display[permission.type] =
-              search_geolocation_service_->GetDSEGeolocationSetting()
-                  ? CONTENT_SETTING_ALLOW
-                  : CONTENT_SETTING_BLOCK;
-        }
+            *setting_to_display;
       }
     }
   }
 
   for (const auto& permission : permissions_to_display) {
     if (base::ContainsKey(user_specified_settings_to_display, permission)) {
       base::string16 setting_title =
           PageInfoUI::PermissionTypeToUIString(permission);
 
       Java_PageInfoPopup_addPermissionSection(
           env, popup_jobject_, ConvertUTF16ToJavaString(env, setting_title),
           static_cast<jint>(permission),
           static_cast<jint>(user_specified_settings_to_display[permission]));
     }
   }
 
   for (const auto& chosen_object : chosen_object_info_list) {
     base::string16 object_title =
         PageInfoUI::ChosenObjectToUIString(*chosen_object);
 
     Java_PageInfoPopup_addPermissionSection(
         env, popup_jobject_, ConvertUTF16ToJavaString(env, object_title),
         static_cast<jint>(chosen_object->ui_info.content_settings_type),
         static_cast<jint>(CONTENT_SETTING_ALLOW));
   }
 
   Java_PageInfoPopup_updatePermissionDisplay(env, popup_jobject_);
 }
 
+base::Optional<ContentSetting> PageInfoPopupAndroid::GetSettingToDisplay(
+    const PermissionInfo& permission) {
+  // All permissions should be displayed if they are non-default.
+  if (permission.setting != CONTENT_SETTING_DEFAULT)
+    return permission.setting;
+
+  // Handle exceptions for permissions which need to be displayed even if they
+  // are set to the default.
+  if (permission.type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
+    if (search_geolocation_service_ &&
+        search_geolocation_service_->UseDSEGeolocationSetting(
+            url::Origin(url_))) {
+      return search_geolocation_service_->GetDSEGeolocationSetting()
+                 ? CONTENT_SETTING_ALLOW
+                 : CONTENT_SETTING_BLOCK;
+    }
+  } else if (permission.type == CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER) {
+    // The subresource filter permission should always display the default
+    // setting if it is showing up in Page Info. Logic for whether the
+    // setting should show up in Page Info is in ShouldShowPermission in
+    // page_info.cc.
+    return permission.default_setting;
+  }
+  return base::Optional<ContentSetting>();
+}
+
 // static
 bool PageInfoPopupAndroid::RegisterPageInfoPopupAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }