Permissions: Allow PermissionManager to return more PermissionStatusSources.

chrome/browser/plugins/flash_download_interception.cc

Index: chrome/browser/plugins/flash_download_interception.cc
diff --git a/chrome/browser/plugins/flash_download_interception.cc b/chrome/browser/plugins/flash_download_interception.cc
index f9a7b4440a8c2ed308a6bc399ea8a0505420970f..278a68a872f2352fd73ee3de3df4f9ad302ac7b4 100644
--- a/chrome/browser/plugins/flash_download_interception.cc
+++ b/chrome/browser/plugins/flash_download_interception.cc
@@ -9,6 +9,7 @@
 #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"
@@ -65,8 +66,11 @@ void FlashDownloadInterception::InterceptFlashDownloadNavigation(
       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);
 
@@ -114,9 +118,11 @@ bool FlashDownloadInterception::ShouldStopFlashDownloadAction(
       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);