Clean up the PermissionInfoBarDelegate hierarchy.

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 "base/feature_list.h"
 #include "base/logging.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
+#include "chrome/common/chrome_features.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/permission_type.h"
 
 using content::PermissionType;
 
 std::size_t PermissionTypeHash::operator()(
     const content::PermissionType& type) const {
   return static_cast<size_t>(type);
 }
 
@@ skipping 49 matching lines @@
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
   } else if (type == CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER) {
     *out = PermissionType::PROTECTED_MEDIA_IDENTIFIER;
 #endif
   } else {
     return false;
   }
   return true;
 }
 
+bool PermissionUtil::ShouldShowPersistenceToggle() {
+  return 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),
       secondary_url_(secondary_url),
       content_type_(content_type),
@@ skipping 33 matching lines @@
   ContentSetting final_content_setting = settings_map->GetContentSetting(
       primary_url_, secondary_url_, content_type_, std::string());
   if (final_content_setting != CONTENT_SETTING_ALLOW) {
     PermissionType permission_type;
     if (PermissionUtil::GetPermissionType(content_type_, &permission_type)) {
       PermissionUmaUtil::PermissionRevoked(permission_type, source_ui_,
                                            primary_url_, profile_);
     }
   }
 }