Move webplugininfo.h to content/public.

chrome/browser/chrome_plugin_browsertest.cc

Index: chrome/browser/chrome_plugin_browsertest.cc
===================================================================
--- chrome/browser/chrome_plugin_browsertest.cc	(revision 212806)
+++ chrome/browser/chrome_plugin_browsertest.cc	(working copy)
@@ -23,11 +23,11 @@
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/process_type.h"
+#include "content/public/common/webplugininfo.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "net/base/net_util.h"
 #include "webkit/plugins/plugin_constants.h"
-#include "webkit/plugins/webplugininfo.h"
 
 using content::BrowserThread;
 
@@ -106,16 +106,16 @@
 
   static void GetFlashPath(std::vector<base::FilePath>* paths) {
     paths->clear();
-    std::vector<webkit::WebPluginInfo> plugins = GetPlugins();
-    for (std::vector<webkit::WebPluginInfo>::const_iterator it =
+    std::vector<content::WebPluginInfo> plugins = GetPlugins();
+    for (std::vector<content::WebPluginInfo>::const_iterator it =
              plugins.begin(); it != plugins.end(); ++it) {
       if (it->name == ASCIIToUTF16(kFlashPluginName))
         paths->push_back(it->path);
     }
   }
 
-  static std::vector<webkit::WebPluginInfo> GetPlugins() {
-    std::vector<webkit::WebPluginInfo> plugins;
+  static std::vector<content::WebPluginInfo> GetPlugins() {
+    std::vector<content::WebPluginInfo> plugins;
     scoped_refptr<content::MessageLoopRunner> runner =
         new content::MessageLoopRunner;
     content::PluginService::GetInstance()->GetPlugins(
@@ -170,9 +170,9 @@
   }
 
   static void GetPluginsInfoCallback(
-      std::vector<webkit::WebPluginInfo>* rv,
+      std::vector<content::WebPluginInfo>* rv,
       const base::Closure& quit_task,
-      const std::vector<webkit::WebPluginInfo>& plugins) {
+      const std::vector<content::WebPluginInfo>& plugins) {
     *rv = plugins;
     quit_task.Run();
   }
@@ -252,7 +252,7 @@
 #endif
   };
 
-  std::vector<webkit::WebPluginInfo> plugins = GetPlugins();
+  std::vector<content::WebPluginInfo> plugins = GetPlugins();
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(expected); ++i) {
     size_t j = 0;
     for (; j < plugins.size(); ++j) {