diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-21 04:29:20 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-21 04:29:20 +0000 |
| commit | d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a (patch) | |
| tree | 58b9de096179d94ab1fa05470340709e76cfdf49 /content/browser/plugin_service_impl_browsertest.cc | |
| parent | ec7293192cc51edb8a89f084a165d384f5f82ab9 (diff) | |
| download | chromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.zip chromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.tar.gz chromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.tar.bz2 | |
Move webplugininfo.h to content/public.
BUG=237249
TBR=scottmg
Review URL: https://codereview.chromium.org/19894003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_service_impl_browsertest.cc')
| -rw-r--r-- | content/browser/plugin_service_impl_browsertest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/plugin_service_impl_browsertest.cc b/content/browser/plugin_service_impl_browsertest.cc index 0f61e2f..1abf725 100644 --- a/content/browser/plugin_service_impl_browsertest.cc +++ b/content/browser/plugin_service_impl_browsertest.cc @@ -64,7 +64,7 @@ class MockPluginProcessHostClient : public PluginProcessHost::Client, ASSERT_TRUE(channel_->Connect()); } - virtual void SetPluginInfo(const webkit::WebPluginInfo& info) OVERRIDE { + virtual void SetPluginInfo(const WebPluginInfo& info) OVERRIDE { ASSERT_TRUE(info.mime_types.size()); ASSERT_EQ(kNPAPITestPluginMimeType, info.mime_types[0].mime_type); set_plugin_info_called_ = true; @@ -125,7 +125,7 @@ class MockPluginServiceFilter : public content::PluginServiceFilter { const void* context, const GURL& url, const GURL& policy_url, - webkit::WebPluginInfo* plugin) OVERRIDE { return true; } + WebPluginInfo* plugin) OVERRIDE { return true; } virtual bool CanLoadPlugin( int render_process_id, @@ -201,7 +201,7 @@ class MockCanceledPluginServiceClient : public PluginProcessHost::Client { MOCK_METHOD1(OnFoundPluginProcessHost, void(PluginProcessHost* host)); MOCK_METHOD0(OnSentPluginChannelRequest, void()); MOCK_METHOD1(OnChannelOpened, void(const IPC::ChannelHandle& handle)); - MOCK_METHOD1(SetPluginInfo, void(const webkit::WebPluginInfo& info)); + MOCK_METHOD1(SetPluginInfo, void(const WebPluginInfo& info)); MOCK_METHOD0(OnError, void()); bool get_resource_context_called() const { @@ -257,7 +257,7 @@ class MockCanceledBeforeSentPluginProcessHostClient virtual ~MockCanceledBeforeSentPluginProcessHostClient() {} // Client implementation. - virtual void SetPluginInfo(const webkit::WebPluginInfo& info) OVERRIDE { + virtual void SetPluginInfo(const WebPluginInfo& info) OVERRIDE { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); ASSERT_TRUE(info.mime_types.size()); ASSERT_EQ(kNPAPITestPluginMimeType, info.mime_types[0].mime_type); |