Merge 180159

chrome/browser/plugins/plugin_infobar_delegates.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/plugin_infobar_delegates.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
+#include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
+#include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_WIN)
@@ skipping 26 matching lines @@
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK,
       false);
   owner()->GetWebContents()->OpenURL(params);
   return false;
 }
 
 void PluginInfoBarDelegate::LoadBlockedPlugins() {
   content::WebContents* web_contents = owner()->GetWebContents();
   if (web_contents) {
-    web_contents->Send(new ChromeViewMsg_LoadBlockedPlugins(
-        web_contents->GetRoutingID(), identifier_));
+    content::RenderViewHost* host = web_contents->GetRenderViewHost();
+    ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins(
+        host->GetProcess()->GetID());
+    host->Send(new ChromeViewMsg_LoadBlockedPlugins(
+        host->GetRoutingID(), identifier_));
   }
 }
 
 gfx::Image* PluginInfoBarDelegate::GetIcon() const {
   return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       IDR_INFOBAR_PLUGIN_INSTALL);
 }
 
 string16 PluginInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
@@ skipping 436 matching lines @@
     WindowOpenDisposition disposition) {
   OpenURLParams params(
       learn_more_url_, Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false);
   owner()->GetWebContents()->OpenURL(params);
   return false;
 }
 #endif  // defined(OS_WIN)
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)