Replace kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugi…

chrome/browser/ui/webui/options/content_settings_handler.cc

Index: chrome/browser/ui/webui/options/content_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index 869039f3ebf49f6d593cbda12c74979e539888e8..3a40b2f12ad02282dd29b9f2c5421e802f675a58 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -742,13 +742,14 @@ void ContentSettingsHandler::OnGetPermissionSettingsCompleted(
 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.