From 9a60ccb9a18e801252c78aee635bb169bfb699e0 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Fri, 19 Jul 2013 22:23:36 +0000 Subject: Remove webkit/plugins/npapi. -NPAPIPluginsSupported moves to PluginService -no need to call it in PluginList methods anymore since PluginService is now the only place that calls these methods, and it can check first -no need for the renderer to call this first since now the browser won't enumerate NPAPI plugins if it's disabled -CreateVersionFromString moves to WebPluginInfo. I couldn't find a better place to put it. -move the constants back to plugin_constants_win.h -move PLUGIN_QUIRK_DIE_AFTER_UNLOAD handling to WebPluginDelegateStub and PluginThread instead of being a global -GetDefaultWindowParent moves to plugin_constants_win.h. I couldn't find a better place. -IsPluginWindow moves to PluginService -GetPluginNameFromWindow and GetPluginVersionFromWindow are both replaced by GetPluginInfoFromWindow which is on PluginService -IsDummyActivationWindow was called by one place so I moved the code there BUG=237249 R=scottmg@chromium.org Review URL: https://codereview.chromium.org/19844003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212672 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/plugin_service_impl_browsertest.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'content/browser/plugin_service_impl_browsertest.cc') diff --git a/content/browser/plugin_service_impl_browsertest.cc b/content/browser/plugin_service_impl_browsertest.cc index 26e4c43..0f61e2f 100644 --- a/content/browser/plugin_service_impl_browsertest.cc +++ b/content/browser/plugin_service_impl_browsertest.cc @@ -18,7 +18,6 @@ #include "content/shell/shell.h" #include "content/test/content_browser_test.h" #include "testing/gmock/include/gmock/gmock.h" -#include "webkit/plugins/npapi/plugin_utils.h" namespace content { @@ -160,7 +159,7 @@ class PluginServiceTest : public ContentBrowserTest { // Try to open a channel to the test plugin. Minimal plugin process spawning // test for the PluginService interface. IN_PROC_BROWSER_TEST_F(PluginServiceTest, OpenChannelToPlugin) { - if (!webkit::npapi::NPAPIPluginsSupported()) + if (!PluginServiceImpl::GetInstance()->NPAPIPluginsSupported()) return; MockPluginProcessHostClient mock_client(GetResourceContext(), false); BrowserThread::PostTask( @@ -170,7 +169,7 @@ IN_PROC_BROWSER_TEST_F(PluginServiceTest, OpenChannelToPlugin) { } IN_PROC_BROWSER_TEST_F(PluginServiceTest, OpenChannelToDeniedPlugin) { - if (!webkit::npapi::NPAPIPluginsSupported()) + if (!PluginServiceImpl::GetInstance()->NPAPIPluginsSupported()) return; MockPluginServiceFilter filter; PluginServiceImpl::GetInstance()->SetFilter(&filter); @@ -307,7 +306,7 @@ class MockCanceledBeforeSentPluginProcessHostClient IN_PROC_BROWSER_TEST_F( PluginServiceTest, CancelBeforeSentOpenChannelToPluginProcessHost) { - if (!webkit::npapi::NPAPIPluginsSupported()) + if (!PluginServiceImpl::GetInstance()->NPAPIPluginsSupported()) return; ::testing::StrictMock mock_client(GetResourceContext()); @@ -361,7 +360,7 @@ class MockCanceledAfterSentPluginProcessHostClient // Should not attempt to open a channel, since it should be canceled early on. IN_PROC_BROWSER_TEST_F( PluginServiceTest, CancelAfterSentOpenChannelToPluginProcessHost) { - if (!webkit::npapi::NPAPIPluginsSupported()) + if (!PluginServiceImpl::GetInstance()->NPAPIPluginsSupported()) return; ::testing::StrictMock mock_client(GetResourceContext()); -- cgit v1.1