Replace kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugi…

chrome/browser/ui/webui/options/content_settings_handler.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/webui/options/content_settings_handler.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 15 matching lines @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/web_site_settings_uma_util.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/notifications/desktop_notification_profile_util.h"
 #include "chrome/browser/permissions/chooser_context_base.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/permissions/permission_util.h"
+#include "chrome/browser/plugins/plugin_utils.h"
 #include "chrome/browser/plugins/plugins_field_trial.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
 #include "chrome/browser/ui/webui/site_settings_helper.h"
 #include "chrome/browser/usb/usb_chooser_context.h"
 #include "chrome/browser/usb/usb_chooser_context_factory.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
@@ skipping 462 matching lines @@
     // PDF Plugin filter.
     {"pdfTabLabel", IDS_PDF_TAB_LABEL},
     {"pdfEnable", IDS_PDF_ENABLE_CHECKBOX},
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
 
   // TODO(tommycli): When the HTML5 By Default feature flag is on, we want to
   // display strings that begin with "Ask...", even though the setting remains
   // DETECT. Once this feature is finalized, then we migrate the setting to ASK.
-  bool is_hbd = base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins);
+  Profile* profile = Profile::FromWebUI(web_ui());
+  bool is_hbd = PluginUtils::ShouldPreferHtmlOverPlugins(
+      HostContentSettingsMapFactory::GetForProfile(profile));
   static OptionsStringResource flash_strings[] = {
       {"pluginsDetectImportantContent",
        is_hbd ? IDS_FLASH_ASK_RECOMMENDED_RADIO
               : IDS_FLASH_DETECT_RECOMMENDED_RADIO},
       {"detectException",
        is_hbd ? IDS_EXCEPTIONS_ASK_BUTTON
               : IDS_EXCEPTIONS_DETECT_IMPORTANT_CONTENT_BUTTON},
   };
   RegisterStrings(localized_strings, flash_strings, arraysize(flash_strings));
 
@@ skipping 202 matching lines @@
         &settings.exceptions);
 
     UpdateFlashMediaLinksVisibility(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
     UpdateFlashMediaLinksVisibility(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
   }
 }
 
 void ContentSettingsHandler::UpdateSettingDefaultFromModel(
     ContentSettingsType type) {
   std::string provider_id;
+  HostContentSettingsMap* host_content_settings_map =
+      HostContentSettingsMapFactory::GetForProfile(GetProfile());
   ContentSetting default_setting =
-      HostContentSettingsMapFactory::GetForProfile(GetProfile())
-          ->GetDefaultContentSetting(type, &provider_id);
+      host_content_settings_map->GetDefaultContentSetting(type, &provider_id);
 
 #if defined(ENABLE_PLUGINS)
-  default_setting =
-      PluginsFieldTrial::EffectiveContentSetting(type, default_setting);
+  default_setting = PluginsFieldTrial::EffectiveContentSetting(
+      host_content_settings_map, type, default_setting);
 #endif
 
   // Camera and microphone default content settings cannot be set by the policy.
   // However, the policy can disable them. Treat this case visually in the same
   // way as if the policy set the default setting to BLOCK. Furthermore, compare
   // the settings with Flash settings and show links to the Flash settings site
   // if they differ.
   if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
       type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {
     UpdateMediaSettingsFromPrefs(type);
@@ skipping 760 matching lines @@
 
   // Exceptions apply only when the feature is enabled.
   PrefService* prefs = user_prefs::UserPrefs::Get(GetBrowserContext(web_ui()));
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunctionUnsafe(
       "ContentSettings.enableProtectedContentExceptions",
       base::FundamentalValue(enable_exceptions));
 }
 
 }  // namespace options