Replace kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugi…

chrome/browser/ui/content_settings/content_setting_bubble_model.cc

 // Copyright (c) 2012 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/content_settings/content_setting_bubble_model.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/chrome_content_settings_utils.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
+#include "chrome/browser/plugins/plugin_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
@@ skipping 159 matching lines @@
         HostContentSettingsMapFactory::GetForProfile(profile());
     GURL url = web_contents()->GetURL();
     std::unique_ptr<base::Value> value = map->GetWebsiteSetting(
         url, url, content_type(), std::string(), nullptr);
     ContentSetting setting =
         content_settings::ValueToContentSetting(value.get());
 
     // When Flash has been hidden from the plugin list, it is impossible to
     // dynamically load all the plugins on the page.
     if (setting == CONTENT_SETTING_BLOCK &&
-        base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins)) {
+        PluginUtils::ShouldPreferHtmlOverPlugins(map)) {
       return;
     }
 
     set_custom_link(l10n_util::GetStringUTF8(IDS_BLOCKED_PLUGINS_LOAD_ALL));
     return;
   }
 
   static const ContentSettingsTypeIdEntry kCustomIDs[] = {
     {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_INFO},
     {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, IDS_ALLOW_INSECURE_CONTENT_BUTTON},
@@ skipping 174 matching lines @@
 
   set_setting_is_managed(setting_source != SETTING_SOURCE_USER &&
                          setting != CONTENT_SETTING_ASK);
 
   // When Flash has been hidden from the plugin list, it is impossible to
   // dynamically load all the plugins on the page. Then the radio group would
   // appear to do nothing. The user must go to Content Settings to enable Flash.
   bool flash_hidden_from_plugin_list =
       content_type() == CONTENT_SETTINGS_TYPE_PLUGINS &&
       setting == CONTENT_SETTING_BLOCK &&
-      base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins);
+      PluginUtils::ShouldPreferHtmlOverPlugins(
+          HostContentSettingsMapFactory::GetForProfile(profile()));
   set_radio_group_enabled(setting_source == SETTING_SOURCE_USER &&
                           !flash_hidden_from_plugin_list);
 
   selected_item_ = radio_group.default_item;
   set_radio_group(radio_group);
 }
 
 void ContentSettingSingleRadioGroup::SetNarrowestContentSetting(
     ContentSetting setting) {
   if (!profile())
@@ skipping 1055 matching lines @@
 ContentSettingMediaStreamBubbleModel*
     ContentSettingBubbleModel::AsMediaStreamBubbleModel() {
   // In general, bubble models might not inherit from the media bubble model.
   return nullptr;
 }
 
 ContentSettingSubresourceFilterBubbleModel*
 ContentSettingBubbleModel::AsSubresourceFilterBubbleModel() {
   return nullptr;
 }