Replace kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugi…

chrome/browser/ui/website_settings/website_settings_ui.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/website_settings/website_settings_ui.h"
 
 #include "base/macros.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/plugins/plugin_utils.h"
 #include "chrome/browser/plugins/plugins_field_trial.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
@@ skipping 204 matching lines @@
     case CONTENT_SETTING_ASK:
       return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_PERMISSION_ASK);
     default:
       NOTREACHED();
       return base::string16();
   }
 }
 
 // static
 base::string16 WebsiteSettingsUI::PermissionActionToUIString(
+    Profile* profile,
     ContentSettingsType type,
     ContentSetting setting,
     ContentSetting default_setting,
     content_settings::SettingSource source) {
   ContentSetting effective_setting = setting;
   if (effective_setting == CONTENT_SETTING_DEFAULT)
     effective_setting = default_setting;
 
 #if defined(ENABLE_PLUGINS)
-  effective_setting =
-      PluginsFieldTrial::EffectiveContentSetting(type, effective_setting);
+  HostContentSettingsMap* host_content_settings_map =
+      HostContentSettingsMapFactory::GetForProfile(profile);
+  effective_setting = PluginsFieldTrial::EffectiveContentSetting(
+      host_content_settings_map, type, effective_setting);
 
   // Display the UI string for ASK instead of DETECT for HTML5 by Default.
   // TODO(tommycli): Once HTML5 by Default is shipped and the feature flag
   // is removed, just migrate the actual content setting to ASK.
-  if (base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins) &&
+  if (PluginUtils::ShouldPreferHtmlOverPlugins(host_content_settings_map) &&
       effective_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT) {
     effective_setting = CONTENT_SETTING_ASK;
   }
 #endif
 
   const int* button_text_ids = NULL;
   switch (source) {
     case content_settings::SETTING_SOURCE_USER:
       if (setting == CONTENT_SETTING_DEFAULT)
         button_text_ids = kPermissionButtonTextIDDefaultSetting;
@@ skipping 127 matching lines @@
   }
   return resource_id;
 }
 
 // static
 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
     WebsiteSettings::SiteConnectionStatus status) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(GetConnectionIconID(status));
 }