Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(983)

Unified Diff: chrome/browser/content_settings/content_settings_browsertest.cc

Issue 12086077: Only permit plug-in loads in the browser if the plug-in isn't blocked or the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/content_settings/content_settings_browsertest.cc
===================================================================
--- chrome/browser/content_settings/content_settings_browsertest.cc (revision 180039)
+++ 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,8 @@
#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/plugin_service.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 +316,12 @@
content::RenderViewHost* host =
browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost();
+ ChromePluginServiceFilter* filter = ChromePluginServiceFilter::GetInstance();
+ int process_id = host->GetProcess()->GetID();
+ FilePath path(FILE_PATH_LITERAL("blah"));
+ EXPECT_FALSE(filter->CanLoadPlugin(process_id, path));
+ filter->AuthorizeAllPlugins(process_id);
+ EXPECT_TRUE(filter->CanLoadPlugin(process_id, path));
host->Send(new ChromeViewMsg_LoadBlockedPlugins(
host->GetRoutingID(), std::string()));
@@ -373,6 +382,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 +417,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 +439,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()));

Powered by Google App Engine
This is Rietveld 408576698