Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

chrome/browser/metrics/metrics_log.h

Index: chrome/browser/metrics/metrics_log.h
diff --git a/chrome/browser/metrics/metrics_log.h b/chrome/browser/metrics/metrics_log.h
index 0cb8b2960c51b1014fb0a36c87833cb1102a97a2..8f35705aaef1da3950235be14439f10e9f8adef9 100644
--- a/chrome/browser/metrics/metrics_log.h
+++ b/chrome/browser/metrics/metrics_log.h
@@ -12,18 +12,13 @@
 #include "base/basictypes.h"
 #include "chrome/common/metrics_helpers.h"
 #include "chrome/common/page_transition_types.h"
+#include "webkit/glue/plugins/webplugininfo.h"
 
 struct AutocompleteLog;
 class DictionaryValue;
 class GURL;
 class PrefService;
 
-namespace webkit {
-namespace npapi {
-struct WebPluginInfo;
-}
-}
-
 class MetricsLog : public MetricsLogBase {
  public:
   // Creates a new metrics log
@@ -40,9 +35,8 @@ class MetricsLog : public MetricsLogBase {
   // profile_metrics, if non-null, gives a dictionary of all profile metrics
   // 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 DictionaryValue* profile_metrics);
+  void RecordEnvironment(const std::vector<WebPluginInfo>& plugin_list,
+                         const DictionaryValue* profile_metrics);
 
   // Records the input text, available choices, and selected entry when the
   // user uses the Omnibox to open a URL.
@@ -86,8 +80,7 @@ class MetricsLog : public MetricsLogBase {
   void WriteRealtimeStabilityAttributes(PrefService* pref);
 
   // Writes the list of installed plugins.
-  void WritePluginList(
-      const std::vector<webkit::npapi::WebPluginInfo>& plugin_list);
+  void WritePluginList(const std::vector<WebPluginInfo>& plugin_list);
 
   // Within the profile group, write basic install info including appversion.
   void WriteInstallElement();