Support persist toggle in PermissionRequestManager path on Android

chrome/browser/permissions/permission_util.cc

 // Copyright 2015 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/permissions/permission_util.h"
 
 #include "build/build_config.h"
 #include "base/feature_list.h"
 #include "base/logging.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ skipping 143 matching lines @@
     case CONTENT_SETTINGS_TYPE_PLUGINS:
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
     case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
 #endif
       return true;
     default:
       return false;
   }
 }
 
-bool PermissionUtil::ShouldShowPersistenceToggle() {
-  return base::FeatureList::IsEnabled(
-      features::kDisplayPersistenceToggleInPermissionPrompts);
+bool PermissionUtil::ShouldShowPersistenceToggle(ContentSettingsType type) {
+  return (type == CONTENT_SETTINGS_TYPE_GEOLOCATION ||
+          type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
+          type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) &&
+         base::FeatureList::IsEnabled(
+             features::kDisplayPersistenceToggleInPermissionPrompts);
 }
 
 PermissionUtil::ScopedRevocationReporter::ScopedRevocationReporter(
     Profile* profile,
     const GURL& primary_url,
     const GURL& secondary_url,
     ContentSettingsType content_type,
     PermissionSourceUI source_ui)
     : profile_(profile),
       primary_url_(primary_url),
@@ skipping 32 matching lines @@
     return;
   HostContentSettingsMap* settings_map =
       HostContentSettingsMapFactory::GetForProfile(profile_);
   ContentSetting final_content_setting = settings_map->GetContentSetting(
       primary_url_, secondary_url_, content_type_, std::string());
   if (final_content_setting != CONTENT_SETTING_ALLOW) {
     PermissionUmaUtil::PermissionRevoked(content_type_, source_ui_,
                                          primary_url_, profile_);
   }
 }