[HBD] If DefaultPluginPolicy set to 3, prompt should allow flash for the next page load only

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 {
 
@@ skipping 87 matching lines @@
   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);
 }