Replace kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugi…

chrome/browser/plugins/flash_download_interception.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/flash_download_interception.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ skipping 39 matching lines @@
     const GURL& source_url) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   HostContentSettingsMap* host_content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(profile);
   ContentSetting flash_setting = PluginUtils::GetFlashPluginContentSetting(
       host_content_settings_map, url::Origin(source_url), source_url, nullptr);
   flash_setting = PluginsFieldTrial::EffectiveContentSetting(
-      CONTENT_SETTINGS_TYPE_PLUGINS, flash_setting);
+      host_content_settings_map, CONTENT_SETTINGS_TYPE_PLUGINS, flash_setting);
 
   if (flash_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT) {
     PermissionManager* manager = PermissionManager::Get(profile);
     manager->RequestPermission(
         content::PermissionType::FLASH, web_contents->GetMainFrame(),
         web_contents->GetLastCommittedURL(), true, base::Bind(&DoNothing));
   } else if (flash_setting == CONTENT_SETTING_BLOCK) {
     TabSpecificContentSettings::FromWebContents(web_contents)
         ->FlashDownloadBlocked();
   }
 
   // If the content setting has been already changed, do nothing.
 }
 
 // static
 bool FlashDownloadInterception::ShouldStopFlashDownloadAction(
     HostContentSettingsMap* host_content_settings_map,
     const GURL& source_url,
     const GURL& target_url,
     bool has_user_gesture) {
-  if (!base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins))
+  if (!PluginUtils::ShouldPreferHtmlOverPlugins(host_content_settings_map))
     return false;
 
   if (!has_user_gesture)
     return false;
 
   if (!base::StartsWith(target_url.GetContent(), kFlashDownloadURL,
                         base::CompareCase::INSENSITIVE_ASCII)) {
     return false;
   }
 
   ContentSetting flash_setting = PluginUtils::GetFlashPluginContentSetting(
       host_content_settings_map, url::Origin(source_url), source_url, nullptr);
   flash_setting = PluginsFieldTrial::EffectiveContentSetting(
-      CONTENT_SETTINGS_TYPE_PLUGINS, flash_setting);
+      host_content_settings_map, CONTENT_SETTINGS_TYPE_PLUGINS, flash_setting);
 
   return flash_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT ||
          flash_setting == CONTENT_SETTING_BLOCK;
 }
 
 // static
 std::unique_ptr<NavigationThrottle>
 FlashDownloadInterception::MaybeCreateThrottleFor(NavigationHandle* handle) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Never intercept Flash Download navigations in a new window.
   if (handle->GetWebContents()->HasOpener())
     return nullptr;
 
   Profile* profile = Profile::FromBrowserContext(
       handle->GetWebContents()->GetBrowserContext());
   HostContentSettingsMap* host_content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(profile);
   GURL source_url = handle->GetWebContents()->GetLastCommittedURL();
   if (!ShouldStopFlashDownloadAction(host_content_settings_map, source_url,
                                      handle->GetURL(),
                                      handle->HasUserGesture())) {
     return nullptr;
   }
 
   return base::MakeUnique<navigation_interception::InterceptNavigationThrottle>(
       handle, base::Bind(&InterceptNavigation, source_url), true);
 }