Replace kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugi…

chrome/browser/plugins/plugin_utils.cc

 // Copyright 2016 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/plugins/plugin_utils.h"
 
 #include "base/values.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/site_settings_helper.h"
@@ skipping 56 matching lines @@
         !uses_plugin_specific_setting &&
         info.primary_pattern == ContentSettingsPattern::Wildcard() &&
         info.secondary_pattern == ContentSettingsPattern::Wildcard();
   }
   if (is_managed)
     *is_managed = info.source == content_settings::SETTING_SOURCE_POLICY;
 
   // For non-JavaScript treated plugins (Flash): unless the user has explicitly
   // ALLOWed plugins, return BLOCK for any non-HTTP and non-FILE origin.
   if (!use_javascript_setting && *setting != CONTENT_SETTING_ALLOW &&
-      base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins) &&
+      PluginUtils::ShouldPreferHtmlOverPlugins(host_content_settings_map) &&
       !main_frame_url.SchemeIsHTTPOrHTTPS() && !main_frame_url.SchemeIsFile()) {
     *setting = CONTENT_SETTING_BLOCK;
   }
 }
 
 }  // namespace
 
 // static
 void PluginUtils::GetPluginContentSetting(
     const HostContentSettingsMap* host_content_settings_map,
@@ skipping 37 matching lines @@
   // policy for the plugin default setting.
   if (provider_id == site_settings::kPolicyProviderId)
     return false;
 
   // TODO(groby): We might also need to disable PreferHtml if there is a
   // PluginsAllowedForUrl/PluginsBlockedForUrl policy. Not sure.
 
   // Fine. No policy interferes. We can haz feature.
   return base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins);
 }