diff options
| author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 00:23:26 +0000 |
|---|---|---|
| committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 00:23:26 +0000 |
| commit | c85b0ba71b5a55647b01de9d345e46896979033d (patch) | |
| tree | ae99657ca1440b7540da473e1bbe6156e43e9be3 /chrome/browser/plugin_service_browsertest.cc | |
| parent | 887ba3adc7b32b7df315ef292ae9395fd75653e5 (diff) | |
| download | chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.zip chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.tar.gz chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.tar.bz2 | |
Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"
Manually reverting r69755, which broke the tree.
BUG=none
TEST=none
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/5998002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_service_browsertest.cc')
| -rw-r--r-- | chrome/browser/plugin_service_browsertest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/plugin_service_browsertest.cc b/chrome/browser/plugin_service_browsertest.cc index 5fed897..8d9e82e 100644 --- a/chrome/browser/plugin_service_browsertest.cc +++ b/chrome/browser/plugin_service_browsertest.cc @@ -11,7 +11,7 @@ #include "chrome/test/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" -#include "webkit/plugins/npapi/plugin_list.h" +#include "webkit/glue/plugins/plugin_list.h" namespace { @@ -26,7 +26,7 @@ class MockPluginProcessHostClient : public PluginProcessHost::Client { MOCK_METHOD0(ID, int()); MOCK_METHOD0(OffTheRecord, bool()); - MOCK_METHOD1(SetPluginInfo, void(const webkit::npapi::WebPluginInfo& info)); + MOCK_METHOD1(SetPluginInfo, void(const WebPluginInfo& info)); MOCK_METHOD1(OnChannelOpened, void(const IPC::ChannelHandle& handle)); MOCK_METHOD0(OnError, void()); @@ -73,10 +73,10 @@ IN_PROC_BROWSER_TEST_F(PluginServiceTest, StartAndFindPluginProcess) { // calls to FindPluginProcess should return non-zero values. PluginProcessHost* default_plugin_process_host = plugin_service_->FindOrStartPluginProcess( - FilePath(webkit::npapi::kDefaultPluginLibraryName)); + FilePath(kDefaultPluginLibraryName)); - EXPECT_EQ(default_plugin_process_host, plugin_service_->FindPluginProcess( - FilePath(webkit::npapi::kDefaultPluginLibraryName))); + EXPECT_EQ(default_plugin_process_host, + plugin_service_->FindPluginProcess(FilePath(kDefaultPluginLibraryName))); } IN_PROC_BROWSER_TEST_F(PluginServiceTest, OpenChannelToPlugin) { @@ -95,7 +95,7 @@ IN_PROC_BROWSER_TEST_F(PluginServiceTest, GetFirstAllowedPluginInfo) { // We should always get a positive response no matter whether we really have // a plugin to support that particular mime type because the Default plugin // supports all mime types. - webkit::npapi::WebPluginInfo plugin_info; + WebPluginInfo plugin_info; std::string plugin_mime_type; plugin_service_->GetFirstAllowedPluginInfo(GURL("http://google.com/"), "application/pdf", |