Make WebPluginInfo more generic

webkit/plugins/npapi/plugin_group.h

Index: webkit/plugins/npapi/plugin_group.h
===================================================================
--- webkit/plugins/npapi/plugin_group.h	(revision 96613)
+++ webkit/plugins/npapi/plugin_group.h	(working copy)
@@ -14,7 +14,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
-#include "webkit/plugins/npapi/webplugininfo.h"
+#include "webkit/plugins/webplugininfo.h"
 
 class FilePath;
 class PluginExceptionsTableModelTest;
@@ -116,10 +116,10 @@
   static bool IsPluginNameEnabledByPolicy(const string16& plugin_name);
 
   // Returns true if the given plugin matches this group.
-  bool Match(const WebPluginInfo& plugin) const;
+  bool Match(const webkit::WebPluginInfo& plugin) const;
 
   // Adds the given plugin to this group.
-  void AddPlugin(const WebPluginInfo& plugin);
+  void AddPlugin(const webkit::WebPluginInfo& plugin);
 
   // Removes a plugin from the group by its path.
   bool RemovePlugin(const FilePath& filename);
@@ -156,7 +156,7 @@
   string16 GetGroupName() const;
 
   // Returns all plugins added to the group.
-  const std::vector<WebPluginInfo>& web_plugins_info() const {
+  const std::vector<webkit::WebPluginInfo>& web_plugins_info() const {
     return web_plugin_infos_;
   }
 
@@ -198,7 +198,9 @@
   // in accepting weird version strings than Version::GetFromString().
   static Version* CreateVersionFromString(const string16& version_string);
 
-  std::vector<WebPluginInfo> web_plugin_infos() { return web_plugin_infos_; }
+  std::vector<webkit::WebPluginInfo> web_plugin_infos() {
+    return web_plugin_infos_;
+  }
 
  private:
   friend class PluginList;
@@ -208,11 +210,11 @@
   FRIEND_TEST_ALL_PREFIXES(PluginListTest, DisableOutdated);
 
   // Generates the (short) identifier string for the given plugin.
-  static std::string GetIdentifier(const WebPluginInfo& wpi);
+  static std::string GetIdentifier(const webkit::WebPluginInfo& wpi);
 
   // Generates the long identifier (based on the full file path) for the given
   // plugin, to be called when the short identifier is not unique.
-  static std::string GetLongIdentifier(const WebPluginInfo& wpi);
+  static std::string GetLongIdentifier(const webkit::WebPluginInfo& wpi);
 
   // Creates a PluginGroup from a PluginGroupDefinition. The caller takes
   // ownership of the created PluginGroup.
@@ -221,7 +223,7 @@
 
   // Creates a PluginGroup from a WebPluginInfo. The caller takes ownership of
   // the created PluginGroup.
-  static PluginGroup* FromWebPluginInfo(const WebPluginInfo& wpi);
+  static PluginGroup* FromWebPluginInfo(const webkit::WebPluginInfo& wpi);
 
   // Returns |true| if |version| is contained in [low, high) of |range|.
   static bool IsVersionInRange(const Version& version,
@@ -241,11 +243,11 @@
 
   // Set the description and version for this plugin group from the
   // given plug-in.
-  void UpdateDescriptionAndVersion(const WebPluginInfo& plugin);
+  void UpdateDescriptionAndVersion(const webkit::WebPluginInfo& plugin);
 
   // Updates the active plugin in the group. The active plugin is the first
   // enabled one, or if all plugins are disabled, simply the first one.
-  void UpdateActivePlugin(const WebPluginInfo& plugin);
+  void UpdateActivePlugin(const webkit::WebPluginInfo& plugin);
 
   // Resets the group state to its default value (as if the group was empty).
   // After calling this method, calling |UpdateActivePlugin| with all plugins
@@ -254,20 +256,20 @@
 
   // Enables the plugin if not already enabled and if policy allows it to.
   // Returns true on success. Does not update the group state.
-  static bool Enable(WebPluginInfo* plugin, int reason);
+  static bool Enable(webkit::WebPluginInfo* plugin, int reason);
 
   // Disables the plugin if not already disabled and if policy allows it to.
   // Returns true on success. Does not update the group state.
-  static bool Disable(WebPluginInfo* plugin, int reason);
+  static bool Disable(webkit::WebPluginInfo* plugin, int reason);
 
   // Helper function to implement the functions above.
-  static bool SetPluginState(WebPluginInfo* plugin,
+  static bool SetPluginState(webkit::WebPluginInfo* plugin,
                              int new_reason,
                              bool state_changes);
 
   // Returns a non-const vector of all plugins in the group. This is only used
   // by PluginList.
-  std::vector<WebPluginInfo>& GetPluginsContainer() {
+  std::vector<webkit::WebPluginInfo>& GetPluginsContainer() {
     return web_plugin_infos_;
   }
 
@@ -287,7 +289,7 @@
   bool enabled_;
   std::vector<VersionRange> version_ranges_;
   scoped_ptr<Version> version_;
-  std::vector<WebPluginInfo> web_plugin_infos_;
+  std::vector<webkit::WebPluginInfo> web_plugin_infos_;
 };
 
 }  // namespace npapi