Make WebPluginInfo more generic

chrome/browser/metrics/metrics_log.cc

Index: chrome/browser/metrics/metrics_log.cc
===================================================================
--- chrome/browser/metrics/metrics_log.cc	(revision 96613)
+++ chrome/browser/metrics/metrics_log.cc	(working copy)
@@ -26,7 +26,7 @@
 #include "chrome/common/pref_names.h"
 #include "content/browser/gpu/gpu_data_manager.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/plugins/npapi/webplugininfo.h"
+#include "webkit/plugins/webplugininfo.h"
 
 #define OPEN_ELEMENT_FOR_SCOPE(name) ScopedElement scoped_element(this, name)
 
@@ -270,12 +270,12 @@
 }
 
 void MetricsLog::WritePluginList(
-    const std::vector<webkit::npapi::WebPluginInfo>& plugin_list) {
+    const std::vector<webkit::WebPluginInfo>& plugin_list) {
   DCHECK(!locked_);
 
   OPEN_ELEMENT_FOR_SCOPE("plugins");
 
-  for (std::vector<webkit::npapi::WebPluginInfo>::const_iterator iter =
+  for (std::vector<webkit::WebPluginInfo>::const_iterator iter =
            plugin_list.begin();
        iter != plugin_list.end(); ++iter) {
     OPEN_ELEMENT_FOR_SCOPE("plugin");
@@ -291,7 +291,7 @@
 #endif
     WriteAttribute("filename", CreateBase64Hash(filename_bytes));
     WriteAttribute("version", UTF16ToUTF8(iter->version));
-    WriteIntAttribute("disabled", !webkit::npapi::IsPluginEnabled(*iter));
+    WriteIntAttribute("disabled", !webkit::IsPluginEnabled(*iter));
   }
 }
 
@@ -302,7 +302,7 @@
 }
 
 void MetricsLog::RecordEnvironment(
-         const std::vector<webkit::npapi::WebPluginInfo>& plugin_list,
+         const std::vector<webkit::WebPluginInfo>& plugin_list,
          const DictionaryValue* profile_metrics) {
   DCHECK(!locked_);