Move webplugininfo.h to content/public.

chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc

Index: chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc
===================================================================
--- chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc	(revision 212806)
+++ chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc	(working copy)
@@ -35,7 +35,7 @@
                                  const void* context,
                                  const GURL& url,
                                  const GURL& policy_url,
-                                 webkit::WebPluginInfo* plugin) OVERRIDE;
+                                 content::WebPluginInfo* plugin) OVERRIDE;
 
   virtual bool CanLoadPlugin(int render_process_id,
                              const base::FilePath& path) OVERRIDE;
@@ -53,7 +53,7 @@
                                                 const void* context,
                                                 const GURL& url,
                                                 const GURL& policy_url,
-                                                webkit::WebPluginInfo* plugin) {
+                                                content::WebPluginInfo* plugin) {
   std::map<base::FilePath, bool>::iterator it =
       plugin_state_.find(plugin->path);
   if (it == plugin_state_.end()) {
@@ -79,22 +79,22 @@
   }
 
   virtual void SetUp() OVERRIDE {
-    webkit::WebPluginInfo foo_plugin(ASCIIToUTF16("Foo Plug-in"),
-                                     foo_plugin_path_,
-                                     ASCIIToUTF16("1"),
-                                     ASCIIToUTF16("The Foo plug-in."));
-    webkit::WebPluginMimeType mimeType;
-    mimeType.mime_type = "foo/bar";
-    foo_plugin.mime_types.push_back(mimeType);
+    content::WebPluginInfo foo_plugin(ASCIIToUTF16("Foo Plug-in"),
+                                      foo_plugin_path_,
+                                      ASCIIToUTF16("1"),
+                                      ASCIIToUTF16("The Foo plug-in."));
+    content::WebPluginMimeType mime_type;
+    mime_type.mime_type = "foo/bar";
+    foo_plugin.mime_types.push_back(mime_type);
     PluginService::GetInstance()->Init();
     PluginService::GetInstance()->RegisterInternalPlugin(foo_plugin, false);
 
-    webkit::WebPluginInfo bar_plugin(ASCIIToUTF16("Bar Plug-in"),
-                                     bar_plugin_path_,
-                                     ASCIIToUTF16("1"),
-                                     ASCIIToUTF16("The Bar plug-in."));
-    mimeType.mime_type = "foo/bar";
-    bar_plugin.mime_types.push_back(mimeType);
+    content::WebPluginInfo bar_plugin(ASCIIToUTF16("Bar Plug-in"),
+                                      bar_plugin_path_,
+                                      ASCIIToUTF16("1"),
+                                      ASCIIToUTF16("The Bar plug-in."));
+    mime_type.mime_type = "foo/bar";
+    bar_plugin.mime_types.push_back(mime_type);
     PluginService::GetInstance()->RegisterInternalPlugin(bar_plugin, false);
 
     PluginService::GetInstance()->SetFilter(&filter_);
@@ -120,7 +120,7 @@
   PluginInfoMessageFilter::Context context_;
 
  private:
-  void PluginsLoaded(const std::vector<webkit::WebPluginInfo>& plugins) {
+  void PluginsLoaded(const std::vector<content::WebPluginInfo>& plugins) {
     base::MessageLoop::current()->Quit();
   }
 
@@ -136,7 +136,7 @@
   filter_.set_plugin_enabled(bar_plugin_path_, true);
   {
     ChromeViewHostMsg_GetPluginInfo_Status status;
-    webkit::WebPluginInfo plugin;
+    content::WebPluginInfo plugin;
     std::string actual_mime_type;
     EXPECT_TRUE(context_.FindEnabledPlugin(
         0, GURL(), GURL(), "foo/bar", &status, &plugin, &actual_mime_type,
@@ -148,7 +148,7 @@
   filter_.set_plugin_enabled(foo_plugin_path_, false);
   {
     ChromeViewHostMsg_GetPluginInfo_Status status;
-    webkit::WebPluginInfo plugin;
+    content::WebPluginInfo plugin;
     std::string actual_mime_type;
     EXPECT_TRUE(context_.FindEnabledPlugin(
         0, GURL(), GURL(), "foo/bar", &status, &plugin, &actual_mime_type,
@@ -160,7 +160,7 @@
   filter_.set_plugin_enabled(bar_plugin_path_, false);
   {
     ChromeViewHostMsg_GetPluginInfo_Status status;
-    webkit::WebPluginInfo plugin;
+    content::WebPluginInfo plugin;
     std::string actual_mime_type;
     std::string identifier;
     string16 plugin_name;
@@ -172,7 +172,7 @@
   }
   {
     ChromeViewHostMsg_GetPluginInfo_Status status;
-    webkit::WebPluginInfo plugin;
+    content::WebPluginInfo plugin;
     std::string actual_mime_type;
     EXPECT_FALSE(context_.FindEnabledPlugin(
         0, GURL(), GURL(), "baz/blurp", &status, &plugin, &actual_mime_type,