summaryrefslogtreecommitdiffstats
path: root/content/browser/plugin_service_impl_browsertest.cc
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-08 11:29:02 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-08 11:29:02 +0000
commitdfdfeb7e012ba3be899721cfd0912de08c0e1f53 (patch)
treeab8871fa02db12e51d6655ac2fe2d54783ec492a /content/browser/plugin_service_impl_browsertest.cc
parent9dc6e8b9a45f5e2873271c38371c09e324ff8bd2 (diff)
downloadchromium_src-dfdfeb7e012ba3be899721cfd0912de08c0e1f53.zip
chromium_src-dfdfeb7e012ba3be899721cfd0912de08c0e1f53.tar.gz
chromium_src-dfdfeb7e012ba3be899721cfd0912de08c0e1f53.tar.bz2
Infobar all unknown unsandboxed plug-ins.
BUG=130743 TEST=none Review URL: https://chromiumcodereview.appspot.com/10544003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141197 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_service_impl_browsertest.cc')
-rw-r--r--content/browser/plugin_service_impl_browsertest.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/content/browser/plugin_service_impl_browsertest.cc b/content/browser/plugin_service_impl_browsertest.cc
index 55a27cd..b2c9632 100644
--- a/content/browser/plugin_service_impl_browsertest.cc
+++ b/content/browser/plugin_service_impl_browsertest.cc
@@ -122,6 +122,12 @@ class PluginServiceTest : public InProcessBrowserTest {
command_line->AppendSwitchPath(switches::kExtraPluginDir,
browser_directory.AppendASCII("plugins"));
#endif
+ // TODO(jam): since these plugin tests are running under Chrome, we need to
+ // tell it to disable its security features for old plugins. Once this is
+ // running under content_browsertests, these flags won't be needed.
+ // http://crbug.com/90448
+ // switches::kAlwaysAuthorizePlugins
+ command_line->AppendSwitch("always-authorize-plugins");
}
};
@@ -177,10 +183,7 @@ void QuitUIMessageLoopFromIOThread() {
}
void OpenChannelAndThenCancel(PluginProcessHost::Client* client) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- // Start opening the channel
- PluginServiceImpl::GetInstance()->OpenChannelToNpapiPlugin(
- 0, 0, GURL(), GURL(), kNPAPITestPluginMimeType, client);
+ OpenChannel(client);
// Immediately cancel it. This is guaranteed to work since PluginService needs
// to consult its filter on the FILE thread.
PluginServiceImpl::GetInstance()->CancelOpenChannelToNpapiPlugin(client);