summaryrefslogtreecommitdiffstats
path: root/content/browser/plugin_data_remover_impl.cc
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-01 18:20:54 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-01 18:20:54 +0000
commit6be31d20e5c3727f136b8dfe06cd7f27ebf898bb (patch)
tree4fd003b303a8aad479b3d97fd4d1506817e64c3a /content/browser/plugin_data_remover_impl.cc
parentebee9ccaecaf57a0d2b8a36a41de689eef977fea (diff)
downloadchromium_src-6be31d20e5c3727f136b8dfe06cd7f27ebf898bb.zip
chromium_src-6be31d20e5c3727f136b8dfe06cd7f27ebf898bb.tar.gz
chromium_src-6be31d20e5c3727f136b8dfe06cd7f27ebf898bb.tar.bz2
Only permit plug-in loads in the browser if the plug-in isn't blocked or the
user has authorized it with a browser-mediated interaction. (Reland https://codereview.chromium.org/12086077 with Android test tweak) BUG=172573 R=jam@chromium.org Review URL: https://codereview.chromium.org/12092107 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180159 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_data_remover_impl.cc')
-rw-r--r--content/browser/plugin_data_remover_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/plugin_data_remover_impl.cc b/content/browser/plugin_data_remover_impl.cc
index 6b9ca8a..7b8effc 100644
--- a/content/browser/plugin_data_remover_impl.cc
+++ b/content/browser/plugin_data_remover_impl.cc
@@ -109,7 +109,7 @@ class PluginDataRemoverImpl::Context
if (pepper_info) {
plugin_name_ = pepper_info->name;
// Use the broker since we run this function outside the sandbox.
- plugin_service->OpenChannelToPpapiBroker(plugin_path, this);
+ plugin_service->OpenChannelToPpapiBroker(0, plugin_path, this);
} else {
plugin_service->OpenChannelToNpapiPlugin(
0, 0, GURL(), GURL(), mime_type, this);