Make WebPluginInfo more generic

chrome/browser/metrics/metrics_log.h

Index: chrome/browser/metrics/metrics_log.h
===================================================================
--- chrome/browser/metrics/metrics_log.h	(revision 96613)
+++ chrome/browser/metrics/metrics_log.h	(working copy)
@@ -22,10 +22,8 @@
 }
 
 namespace webkit {
-namespace npapi {
 struct WebPluginInfo;
 }
-}
 
 class MetricsLog : public MetricsLogBase {
  public:
@@ -44,7 +42,7 @@
   // that are to be recorded. Each value in profile_metrics should be a
   // dictionary giving the metrics for the profile.
   void RecordEnvironment(
-      const std::vector<webkit::npapi::WebPluginInfo>& plugin_list,
+      const std::vector<webkit::WebPluginInfo>& plugin_list,
       const base::DictionaryValue* profile_metrics);
 
   // Records the input text, available choices, and selected entry when the
@@ -92,7 +90,7 @@
 
   // Writes the list of installed plugins.
   void WritePluginList(
-      const std::vector<webkit::npapi::WebPluginInfo>& plugin_list);
+      const std::vector<webkit::WebPluginInfo>& plugin_list);
 
   // Within the profile group, write basic install info including appversion.
   void WriteInstallElement();