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/ui/webui/site_settings_helper.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/plugin_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
+#include "components/content_settings/core/common/content_settings_types.h"
 #include "content/public/common/webplugininfo.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 namespace {
 
 const char kFlashPluginID[] = "adobe-flash-player";
 
 void GetPluginContentSettingInternal(
     const HostContentSettingsMap* host_content_settings_map,
@@ skipping 42 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 16 matching lines @@
     const url::Origin& main_frame_origin,
     const GURL& plugin_url,
     bool* is_managed) {
   ContentSetting plugin_setting = CONTENT_SETTING_DEFAULT;
   GetPluginContentSettingInternal(host_content_settings_map,
                                   false /* use_javascript_setting */,
                                   main_frame_origin, plugin_url, kFlashPluginID,
                                   &plugin_setting, nullptr, is_managed);
   return plugin_setting;
 }
+
+// static
+bool PluginUtils::ShouldPreferHtmlOverPlugins(
+    const HostContentSettingsMap* host_content_settings_map) {
+  std::string provider_id;
+  ContentSetting default_setting =
+      host_content_settings_map->GetDefaultContentSetting(
+          CONTENT_SETTINGS_TYPE_PLUGINS, &provider_id);
+  ALLOW_UNUSED_LOCAL(default_setting);
+
+  // Working around a policy issue - do not allow PreferHtml if there is any
+  // policy for the plugin default setting. crbug.com/654072.
+  if (provider_id == site_settings::kPolicyProviderId)
+    return false;
+
+  // Fine. No policy interferes.
+  return base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins);
+}