Permissions: Allow PermissionManager to return more PermissionStatusSources.

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 "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/permissions/permission_manager.h"
+#include "chrome/browser/permissions/permission_result.h"
 #include "chrome/browser/plugins/plugin_utils.h"
 #include "chrome/browser/plugins/plugins_field_trial.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_features.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/navigation_interception/intercept_navigation_throttle.h"
 #include "components/navigation_interception/navigation_params.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 36 matching lines @@
 // static
 void FlashDownloadInterception::InterceptFlashDownloadNavigation(
     content::WebContents* web_contents,
     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);
+  ContentSetting flash_setting =
+      PluginUtils::GetFlashPluginContentSetting(host_content_settings_map,
+                                                url::Origin(source_url),
+                                                source_url, nullptr)
+          .content_setting;
   flash_setting = PluginsFieldTrial::EffectiveContentSetting(
       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_SETTINGS_TYPE_PLUGINS, web_contents->GetMainFrame(),
         web_contents->GetLastCommittedURL(), true, base::Bind(&DoNothing));
   } else if (flash_setting == CONTENT_SETTING_BLOCK) {
     TabSpecificContentSettings::FromWebContents(web_contents)
@@ skipping 27 matching lines @@
       source_url.ReplaceComponents(replacements).GetContent();
   if (RE2::PartialMatch(source_url_str, kGetFlashURLCanonicalRegex))
     return false;
 
   std::string target_url_str =
       target_url.ReplaceComponents(replacements).GetContent();
   if (RE2::FullMatch(target_url_str, kGetFlashURLCanonicalRegex) ||
       RE2::FullMatch(target_url_str, kGetFlashURLSecondaryGoRegex) ||
       (RE2::FullMatch(target_url_str, kGetFlashURLSecondaryDownloadRegex) &&
        target_url.query() == kGetFlashURLSecondaryDownloadQuery)) {
-    ContentSetting flash_setting = PluginUtils::GetFlashPluginContentSetting(
-        host_content_settings_map, url::Origin(source_url), source_url,
-        nullptr);
+    ContentSetting flash_setting =
+        PluginUtils::GetFlashPluginContentSetting(host_content_settings_map,
+                                                  url::Origin(source_url),
+                                                  source_url, nullptr)
+            .content_setting;
     flash_setting = PluginsFieldTrial::EffectiveContentSetting(
         host_content_settings_map, CONTENT_SETTINGS_TYPE_PLUGINS,
         flash_setting);
 
     return flash_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT ||
            flash_setting == CONTENT_SETTING_BLOCK;
   }
 
   return false;
 }
@@ skipping 24 matching lines @@
   HostContentSettingsMap* host_content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(profile);
   if (!ShouldStopFlashDownloadAction(host_content_settings_map, source_url,
                                      handle->GetURL(), has_user_gesture)) {
     return nullptr;
   }
 
   return base::MakeUnique<navigation_interception::InterceptNavigationThrottle>(
       handle, base::Bind(&InterceptNavigation, source_url));
 }