Move webplugininfo.h to content/public.

content/browser/plugin_service_impl_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/plugin_service_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
@@ skipping 46 matching lines @@
   virtual void OnSentPluginChannelRequest() OVERRIDE {}
 
   virtual void OnChannelOpened(const IPC::ChannelHandle& handle) OVERRIDE {
     ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
     ASSERT_TRUE(set_plugin_info_called_);
     ASSERT_TRUE(!channel_);
     channel_ = new IPC::Channel(handle, IPC::Channel::MODE_CLIENT, this);
     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;
   }
 
   virtual void OnError() OVERRIDE {
     Fail();
   }
 
   // IPC::Listener implementation.
@@ skipping 40 matching lines @@
 class MockPluginServiceFilter : public content::PluginServiceFilter {
  public:
   MockPluginServiceFilter() {}
 
   virtual bool IsPluginAvailable(
       int render_process_id,
       int render_view_id,
       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,
       const base::FilePath& path) OVERRIDE { return false; }
 };
 
 class PluginServiceTest : public ContentBrowserTest {
  public:
   PluginServiceTest() {}
 
@@ skipping 55 matching lines @@
   // Client implementation.
   MOCK_METHOD0(ID, int());
   virtual ResourceContext* GetResourceContext() OVERRIDE {
     get_resource_context_called_ = true;
     return context_;
   }
   MOCK_METHOD0(OffTheRecord, bool());
   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 {
     return get_resource_context_called_;
   }
 
  private:
   ResourceContext* context_;
   bool get_resource_context_called_;
 
@@ skipping 35 matching lines @@
   MockCanceledBeforeSentPluginProcessHostClient(
       ResourceContext* context)
       : MockCanceledPluginServiceClient(context),
         set_plugin_info_called_(false),
         on_found_plugin_process_host_called_(false),
         host_(NULL) {}
 
   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);
     set_plugin_info_called_ = true;
   }
   virtual void OnFoundPluginProcessHost(PluginProcessHost* host) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     set_on_found_plugin_process_host_called();
     set_host(host);
     // This gets called right before we request the plugin<=>renderer channel,
@@ skipping 97 matching lines @@
       BrowserThread::IO, FROM_HERE,
       base::Bind(&OpenChannel, &mock_client));
   RunMessageLoop();
   EXPECT_TRUE(mock_client.get_resource_context_called());
   EXPECT_TRUE(mock_client.set_plugin_info_called());
   EXPECT_TRUE(mock_client.on_found_plugin_process_host_called());
   EXPECT_TRUE(mock_client.on_sent_plugin_channel_request_called());
 }
 
 }  // namespace content