Permissions: Allow PermissionManager to return more PermissionStatusSources.

chrome/browser/plugins/chrome_plugin_service_filter.cc

Index: chrome/browser/plugins/chrome_plugin_service_filter.cc
diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.cc b/chrome/browser/plugins/chrome_plugin_service_filter.cc
index 1783a101aa024a5aa39a7bd7c335427398d47093..4611bbd7025c7be12601ebbb3eac91b2b7e1577c 100644
--- a/chrome/browser/plugins/chrome_plugin_service_filter.cc
+++ b/chrome/browser/plugins/chrome_plugin_service_filter.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
+#include "chrome/browser/permissions/permission_result.h"
 #include "chrome/browser/plugins/flash_temporary_permission_tracker.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/plugins/plugin_metadata.h"
@@ -223,8 +224,10 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
     bool is_managed = false;
     HostContentSettingsMap* settings_map =
         context_info_it->second->host_content_settings_map.get();
-    ContentSetting flash_setting = PluginUtils::GetFlashPluginContentSetting(
-        settings_map, main_frame_origin, plugin_content_url, &is_managed);
+    ContentSetting flash_setting =
+        PluginUtils::GetFlashPluginContentSetting(
+            settings_map, main_frame_origin, plugin_content_url, &is_managed)
+            .content_setting;
     flash_setting = PluginsFieldTrial::EffectiveContentSetting(
         settings_map, CONTENT_SETTINGS_TYPE_PLUGINS, flash_setting);
     double engagement = SiteEngagementService::GetScoreFromSettings(