Permissions: Allow PermissionManager to return more PermissionStatusSources.

chrome/browser/plugins/flash_permission_context.cc

Index: chrome/browser/plugins/flash_permission_context.cc
diff --git a/chrome/browser/plugins/flash_permission_context.cc b/chrome/browser/plugins/flash_permission_context.cc
index 5ff9ed8f2d7af77e2e77a9a36f68fe644a131419..16c962795c9b4d219bcd16bd0311de7922ca893e 100644
--- a/chrome/browser/plugins/flash_permission_context.cc
+++ b/chrome/browser/plugins/flash_permission_context.cc
@@ -37,20 +37,21 @@ FlashPermissionContext::FlashPermissionContext(Profile* profile)
 
 FlashPermissionContext::~FlashPermissionContext() {}
 
-ContentSetting FlashPermissionContext::GetPermissionStatusInternal(
+PermissionResult FlashPermissionContext::GetPermissionStatusInternal(
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
     const GURL& embedding_origin) const {
   HostContentSettingsMap* host_content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(profile());
-  ContentSetting flash_setting = PluginUtils::GetFlashPluginContentSetting(
+  PermissionResult flash_result = PluginUtils::GetFlashPluginContentSetting(
       host_content_settings_map, url::Origin(embedding_origin),
       requesting_origin, nullptr);
-  flash_setting = PluginsFieldTrial::EffectiveContentSetting(
-      host_content_settings_map, content_settings_type(), flash_setting);
-  if (flash_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT)
-    return CONTENT_SETTING_ASK;
-  return flash_setting;
+  flash_result.content_setting = PluginsFieldTrial::EffectiveContentSetting(
+      host_content_settings_map, content_settings_type(),
+      flash_result.content_setting);
+  if (flash_result.content_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT)
+    flash_result.content_setting = CONTENT_SETTING_ASK;
+  return flash_result;
 }
 
 void FlashPermissionContext::UpdateTabContext(const PermissionRequestID& id,