Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put...

chrome/browser/metrics/metrics_service.h

Index: chrome/browser/metrics/metrics_service.h
===================================================================
--- chrome/browser/metrics/metrics_service.h	(revision 69426)
+++ chrome/browser/metrics/metrics_service.h	(working copy)
@@ -33,7 +33,12 @@
 class MetricsLogBase;
 class PrefService;
 class TemplateURLModel;
+
+namespace webkit {
+namespace npapi {
 struct WebPluginInfo;
+}
+}
 
 // Forward declaration of the xmlNode to avoid having tons of gyp files
 // needing to depend on the libxml third party lib.
@@ -155,7 +160,7 @@
   // Callback to let us know that the init task is done.
   void OnInitTaskComplete(
       const std::string& hardware_class,
-      const std::vector<WebPluginInfo>& plugins);
+      const std::vector<webkit::npapi::WebPluginInfo>& plugins);
 
   // When we start a new version of Chromium (different from our last run), we
   // need to discard the old crash stats so that we don't attribute crashes etc.
@@ -418,7 +423,7 @@
   std::string hardware_class_;
 
   // The list of plugins which was retrieved on the file thread.
-  std::vector<WebPluginInfo> plugins_;
+  std::vector<webkit::npapi::WebPluginInfo> plugins_;
 
   // The outstanding transmission appears as a URL Fetch operation.
   scoped_ptr<URLFetcher> current_fetch_;