Index: chrome/browser/content_settings/content_settings_browsertest.cc |
=================================================================== |
--- chrome/browser/content_settings/content_settings_browsertest.cc (revision 179787) |
+++ chrome/browser/content_settings/content_settings_browsertest.cc (working copy) |
@@ -10,6 +10,7 @@ |
#include "chrome/browser/content_settings/host_content_settings_map.h" |
#include "chrome/browser/content_settings/tab_specific_content_settings.h" |
#include "chrome/browser/net/url_request_mock_util.h" |
+#include "chrome/browser/plugins/chrome_plugin_service_filter.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/browser_commands.h" |
@@ -19,6 +20,7 @@ |
#include "chrome/test/base/in_process_browser_test.h" |
#include "chrome/test/base/ui_test_utils.h" |
#include "content/public/browser/browser_thread.h" |
+#include "content/public/browser/render_process_host.h" |
#include "content/public/browser/render_view_host.h" |
#include "content/public/browser/web_contents.h" |
#include "content/public/common/content_switches.h" |
@@ -313,6 +315,8 @@ |
content::RenderViewHost* host = |
browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(); |
+ ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins( |
+ host->GetProcess()->GetID()); |
host->Send(new ChromeViewMsg_LoadBlockedPlugins( |
host->GetRoutingID(), std::string())); |
@@ -373,6 +377,8 @@ |
content::RenderViewHost* host = |
browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(); |
+ ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins( |
+ host->GetProcess()->GetID()); |
host->Send(new ChromeViewMsg_LoadBlockedPlugins( |
host->GetRoutingID(), std::string())); |
EXPECT_EQ(expected_title1, title_watcher1.WaitAndGetTitle()); |
@@ -406,6 +412,8 @@ |
content::RenderViewHost* host = |
browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(); |
+ ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins( |
+ host->GetProcess()->GetID()); |
host->Send(new ChromeViewMsg_LoadBlockedPlugins( |
host->GetRoutingID(), std::string())); |
@@ -426,6 +434,8 @@ |
content::RenderViewHost* host = |
browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(); |
+ ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins( |
+ host->GetProcess()->GetID()); |
host->Send(new ChromeViewMsg_LoadBlockedPlugins( |
host->GetRoutingID(), std::string())); |