Move webplugininfo.h to content/public.

content/public/browser/plugin_service.h

Index: content/public/browser/plugin_service.h
===================================================================
--- content/public/browser/plugin_service.h	(revision 212806)
+++ content/public/browser/plugin_service.h	(working copy)
@@ -18,10 +18,6 @@
 class FilePath;
 }
 
-namespace webkit {
-struct WebPluginInfo;
-}
-
 namespace content {
 
 class BrowserContext;
@@ -29,6 +25,7 @@
 class PluginServiceFilter;
 class ResourceContext;
 struct PepperPluginInfo;
+struct WebPluginInfo;
 
 // This must be created on the main thread but it's only called on the IO/file
 // thread. This is an asynchronous wrapper around the PluginList interface for
@@ -36,7 +33,7 @@
 // doing expensive disk operations on the IO/UI threads.
 class PluginService {
  public:
-  typedef base::Callback<void(const std::vector<webkit::WebPluginInfo>&)>
+  typedef base::Callback<void(const std::vector<WebPluginInfo>&)>
       GetPluginsCallback;
 
   // Returns the PluginService singleton.
@@ -66,7 +63,7 @@
       const GURL& url,
       const std::string& mime_type,
       bool allow_wildcard,
-      std::vector<webkit::WebPluginInfo>* info,
+      std::vector<WebPluginInfo>* info,
       std::vector<std::string>* actual_mime_types) = 0;
 
   // Gets plugin info for an individual plugin and filters the plugins using
@@ -80,14 +77,14 @@
                              const std::string& mime_type,
                              bool allow_wildcard,
                              bool* is_stale,
-                             webkit::WebPluginInfo* info,
+                             WebPluginInfo* info,
                              std::string* actual_mime_type) = 0;
 
   // Get plugin info by plugin path (including disabled plugins). Returns true
   // if the plugin is found and WebPluginInfo has been filled in |info|. This
   // will use cached data in the plugin list.
   virtual bool GetPluginInfoByPath(const base::FilePath& plugin_path,
-                                   webkit::WebPluginInfo* info) = 0;
+                                   WebPluginInfo* info) = 0;
 
   // Returns the display name for the plugin identified by the given path. If
   // the path doesn't identify a plugin, or the plugin has no display name,
@@ -132,7 +129,7 @@
   // be loaded using PluginList::LoadPlugin().
   // If |add_at_beginning| is true the plugin will be added earlier in
   // the list so that it can override the MIME types of older registrations.
-  virtual void RegisterInternalPlugin(const webkit::WebPluginInfo& info,
+  virtual void RegisterInternalPlugin(const WebPluginInfo& info,
                                       bool add_at_beginning) = 0;
 
   // Removes a specified internal plugin from the list. The search will match
@@ -140,8 +137,7 @@
   virtual void UnregisterInternalPlugin(const base::FilePath& path) = 0;
 
   // Gets a list of all the registered internal plugins.
-  virtual void GetInternalPlugins(
-      std::vector<webkit::WebPluginInfo>* plugins) = 0;
+  virtual void GetInternalPlugins(std::vector<WebPluginInfo>* plugins) = 0;
 
   // Returns true iff NPAPI plugins are supported on the current platform.
   // This can be called from any thread.