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

webkit/glue/plugins/plugin_group.h

Index: webkit/glue/plugins/plugin_group.h
diff --git a/webkit/plugins/npapi/plugin_group.h b/webkit/glue/plugins/plugin_group.h
similarity index 94%
rename from webkit/plugins/npapi/plugin_group.h
rename to webkit/glue/plugins/plugin_group.h
index ae093ab1ee416398c8e69b2242795fae9b66f0b2..5098787635b1f7d6d26b5f06b146964b0707995c 100644
--- a/webkit/plugins/npapi/plugin_group.h
+++ b/webkit/glue/plugins/plugin_group.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_GROUP_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGIN_GROUP_H_
+#ifndef WEBKIT_GLUE_PLUGINS_PLUGIN_GROUP_H_
+#define WEBKIT_GLUE_PLUGINS_PLUGIN_GROUP_H_
 #pragma once
 
 #include <map>
@@ -17,15 +17,12 @@
 
 class DictionaryValue;
 class FilePath;
-class TableModelArrayControllerTest;
-class PluginExceptionsTableModelTest;
 class Version;
+struct WebPluginInfo;
 
-namespace webkit {
-namespace npapi {
-
+namespace NPAPI {
 class PluginList;
-struct WebPluginInfo;
+};
 
 // Hard-coded version ranges for plugin groups.
 struct VersionRangeDefinition {
@@ -146,10 +143,10 @@ class PluginGroup {
  private:
   typedef std::map<std::string, PluginGroup*> PluginMap;
 
-  friend class PluginList;
+  friend class NPAPI::PluginList;
   friend class PluginGroupTest;
-  friend class ::TableModelArrayControllerTest;
-  friend class ::PluginExceptionsTableModelTest;
+  friend class TableModelArrayControllerTest;
+  friend class PluginExceptionsTableModelTest;
 
   // Generates the (short) identifier string for the given plugin.
   static std::string GetIdentifier(const WebPluginInfo& wpi);
@@ -205,7 +202,4 @@ class PluginGroup {
   std::vector<int> web_plugin_positions_;
 };
 
-}  // namespace npapi
-}  // namespace webkit
-
-#endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_GROUP_H_
+#endif  // WEBKIT_GLUE_PLUGINS_PLUGIN_GROUP_H_