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

webkit/plugins/npapi/plugin_group.h

Index: webkit/plugins/npapi/plugin_group.h
===================================================================
--- webkit/plugins/npapi/plugin_group.h	(revision 0)
+++ webkit/plugins/npapi/plugin_group.h	(working copy)
@@ -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_GLUE_PLUGINS_PLUGIN_GROUP_H_
-#define WEBKIT_GLUE_PLUGINS_PLUGIN_GROUP_H_
+#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_GROUP_H_
+#define WEBKIT_PLUGINS_NPAPI_PLUGIN_GROUP_H_
 #pragma once
 
 #include <map>
@@ -18,11 +18,12 @@
 class DictionaryValue;
 class FilePath;
 class Version;
-struct WebPluginInfo;
 
-namespace NPAPI {
+namespace webkit {
+namespace npapi {
+
 class PluginList;
-};
+struct WebPluginInfo;
 
 // Hard-coded version ranges for plugin groups.
 struct VersionRangeDefinition {
@@ -143,7 +144,7 @@
  private:
   typedef std::map<std::string, PluginGroup*> PluginMap;
 
-  friend class NPAPI::PluginList;
+  friend class PluginList;
   friend class PluginGroupTest;
   friend class TableModelArrayControllerTest;
   friend class PluginExceptionsTableModelTest;
@@ -202,4 +203,7 @@
   std::vector<int> web_plugin_positions_;
 };
 
-#endif  // WEBKIT_GLUE_PLUGINS_PLUGIN_GROUP_H_
+}  // namespace npapi
+}  // namespace webkit
+
+#endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_GROUP_H_