Permissions: Allow PermissionManager to return more PermissionStatusSources.

chrome/browser/plugins/plugin_utils.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/plugin_utils.h"
 
 #include "base/values.h"
+#include "chrome/browser/permissions/permission_result.h"
+#include "chrome/browser/permissions/permission_util.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/plugin_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "content/public/common/webplugininfo.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 namespace {
 
 const char kFlashPluginID[] = "adobe-flash-player";
 
 void GetPluginContentSettingInternal(
     const HostContentSettingsMap* host_content_settings_map,
     bool use_javascript_setting,
     const url::Origin& main_frame_origin,
     const GURL& plugin_url,
     const std::string& resource,
-    ContentSetting* setting,
+    PermissionResult* permission_result,
     bool* uses_default_content_setting,
     bool* is_managed) {
   GURL main_frame_url = main_frame_origin.GetURL();
   std::unique_ptr<base::Value> value;
   content_settings::SettingInfo info;
   bool uses_plugin_specific_setting = false;
   if (use_javascript_setting) {
     value = host_content_settings_map->GetWebsiteSetting(
         main_frame_url, main_frame_url, CONTENT_SETTINGS_TYPE_JAVASCRIPT,
         std::string(), &info);
@@ skipping 14 matching lines @@
         specific_setting &&
         general_info.source != content_settings::SETTING_SOURCE_POLICY;
     if (uses_plugin_specific_setting) {
       value = std::move(specific_setting);
       info = specific_info;
     } else {
       value = std::move(general_setting);
       info = general_info;
     }
   }
-  *setting = content_settings::ValueToContentSetting(value.get());
+  permission_result->content_setting =
+      content_settings::ValueToContentSetting(value.get());
+  permission_result->source =
+      PermissionUtil::ConvertSettingSourceToPermissionStatusSource(info.source);
   if (uses_default_content_setting) {
     *uses_default_content_setting =
         !uses_plugin_specific_setting &&
         info.primary_pattern == ContentSettingsPattern::Wildcard() &&
         info.secondary_pattern == ContentSettingsPattern::Wildcard();
   }
   if (is_managed)
     *is_managed = info.source == content_settings::SETTING_SOURCE_POLICY;
 
   // For non-JavaScript treated plugins (Flash): unless the user has explicitly
   // ALLOWed plugins, return BLOCK for any non-HTTP and non-FILE origin.
-  if (!use_javascript_setting && *setting != CONTENT_SETTING_ALLOW &&
+  if (!use_javascript_setting &&
+      permission_result->content_setting != CONTENT_SETTING_ALLOW &&
       PluginUtils::ShouldPreferHtmlOverPlugins(host_content_settings_map) &&
       !main_frame_url.SchemeIsHTTPOrHTTPS() && !main_frame_url.SchemeIsFile()) {
-    *setting = CONTENT_SETTING_BLOCK;
+    permission_result->content_setting = CONTENT_SETTING_BLOCK;
   }
 }
 
 }  // namespace
 
 // static
 void PluginUtils::GetPluginContentSetting(
     const HostContentSettingsMap* host_content_settings_map,
     const content::WebPluginInfo& plugin,
     const url::Origin& main_frame_origin,
     const GURL& plugin_url,
     const std::string& resource,
-    ContentSetting* setting,
+    PermissionResult* permission_result,
     bool* uses_default_content_setting,
     bool* is_managed) {
   GetPluginContentSettingInternal(
       host_content_settings_map, ShouldUseJavaScriptSettingForPlugin(plugin),
-      main_frame_origin, plugin_url, resource, setting,
+      main_frame_origin, plugin_url, resource, permission_result,
       uses_default_content_setting, is_managed);
 }
 
 // static
-ContentSetting PluginUtils::GetFlashPluginContentSetting(
+PermissionResult PluginUtils::GetFlashPluginContentSetting(
     const HostContentSettingsMap* host_content_settings_map,
     const url::Origin& main_frame_origin,
     const GURL& plugin_url,
     bool* is_managed) {
-  ContentSetting plugin_setting = CONTENT_SETTING_DEFAULT;
+  PermissionResult result = PermissionResult(
+      CONTENT_SETTING_DEFAULT, PermissionStatusSource::UNSPECIFIED);
   GetPluginContentSettingInternal(host_content_settings_map,
                                   false /* use_javascript_setting */,
                                   main_frame_origin, plugin_url, kFlashPluginID,
-                                  &plugin_setting, nullptr, is_managed);
-  return plugin_setting;
+                                  &result, nullptr, is_managed);
+  return result;
 }
 
 // static
 bool PluginUtils::ShouldPreferHtmlOverPlugins(
     const HostContentSettingsMap* host_content_settings_map) {
   return base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins);
 }