Permissions: Allow PermissionManager to return more PermissionStatusSources.

chrome/browser/plugins/flash_permission_context.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_permission_context.h"
 
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/plugins/flash_temporary_permission_tracker.h"
 #include "chrome/browser/plugins/plugin_utils.h"
@@ skipping 19 matching lines @@
 
 }  // namespace
 
 FlashPermissionContext::FlashPermissionContext(Profile* profile)
     : PermissionContextBase(profile,
                             CONTENT_SETTINGS_TYPE_PLUGINS,
                             blink::WebFeaturePolicyFeature::kNotFound) {}
 
 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,
                                               const GURL& requesting_origin,
                                               bool allowed) {
   if (!allowed)
     return;
 
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(
@@ skipping 34 matching lines @@
   else
     pattern = ContentSettingsPattern::FromURLNoWildcard(embedding_origin);
   host_content_settings_map->SetContentSettingCustomScope(
       pattern, ContentSettingsPattern::Wildcard(), content_settings_type(),
       std::string(), content_setting);
 }
 
 bool FlashPermissionContext::IsRestrictedToSecureOrigins() const {
   return false;
 }