Permissions: Allow PermissionManager to return more PermissionStatusSources.

chrome/browser/plugins/chrome_plugin_service_filter.cc

 // Copyright (c) 2012 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/chrome_plugin_service_filter.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #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"
 #include "chrome/browser/plugins/plugin_utils.h"
 #include "chrome/browser/plugins/plugins_field_trial.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/render_messages.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 190 matching lines @@
       PluginUtils::ShouldPreferHtmlOverPlugins(
           context_info->host_content_settings_map.get())) {
     // Check the content setting first, and always respect the ALLOW or BLOCK
     // state. When IsPluginAvailable() is called to check whether a plugin
     // should be advertised, |url| has the same origin as |main_frame_origin|.
     // The intended behavior is that Flash is advertised only if a Flash embed
     // hosted on the same origin as the main frame origin is allowed to run.
     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(
         settings_map, main_frame_origin.GetURL());
 
     if (flash_setting == CONTENT_SETTING_ALLOW) {
       UMA_HISTOGRAM_COUNTS_100(kEngagementSettingAllowedHistogram, engagement);
       return true;
     }
 
@@ skipping 85 matching lines @@
 
 const ChromePluginServiceFilter::ProcessDetails*
 ChromePluginServiceFilter::GetProcess(
     int render_process_id) const {
   std::map<int, ProcessDetails>::const_iterator it =
       plugin_details_.find(render_process_id);
   if (it == plugin_details_.end())
     return NULL;
   return &it->second;
 }