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

webkit/glue/plugins/gtk_plugin_container_manager.h

Index: webkit/glue/plugins/gtk_plugin_container_manager.h
diff --git a/webkit/plugins/npapi/gtk_plugin_container_manager.h b/webkit/glue/plugins/gtk_plugin_container_manager.h
similarity index 83%
rename from webkit/plugins/npapi/gtk_plugin_container_manager.h
rename to webkit/glue/plugins/gtk_plugin_container_manager.h
index c95d2c3bd2f34e20f47ef3b081067d10a7879130..7f7db8dd45025a6f26586e563314d0819a102574 100644
--- a/webkit/plugins/npapi/gtk_plugin_container_manager.h
+++ b/webkit/glue/plugins/gtk_plugin_container_manager.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_GTK_PLUGIN_CONTAINER_MANAGER_H_
-#define WEBKIT_PLUGINS_NPAPI_GTK_PLUGIN_CONTAINER_MANAGER_H_
+#ifndef WEBKIT_GLUE_PLUGINS_GTK_PLUGIN_CONTAINER_MANAGER_H_
+#define WEBKIT_GLUE_PLUGINS_GTK_PLUGIN_CONTAINER_MANAGER_H_
 
 #include <gtk/gtk.h>
 #include <map>
@@ -12,10 +12,9 @@
 
 typedef struct _GtkWidget GtkWidget;
 
-namespace webkit {
-namespace npapi {
-
+namespace webkit_glue {
 struct WebPluginGeometry;
+}
 
 // Helper class that creates and manages plugin containers (GtkSocket).
 class GtkPluginContainerManager {
@@ -34,7 +33,7 @@ class GtkPluginContainerManager {
 
   // Takes an update from WebKit about a plugin's position and side and moves
   // the plugin accordingly.
-  void MovePluginContainer(const WebPluginGeometry& move);
+  void MovePluginContainer(const webkit_glue::WebPluginGeometry& move);
 
  private:
   // Maps a plugin XID to the corresponding container widget.
@@ -55,7 +54,4 @@ class GtkPluginContainerManager {
   PluginWindowToWidgetMap plugin_window_to_widget_map_;
 };
 
-}  // namespace npapi
-}  // namespace webkit
-
-#endif  // WEBKIT_PLUGINS_NPAPI_GTK_PLUGIN_CONTAINER_MANAGER_H_
+#endif  // WEBKIT_GLUE_PLUGINS_GTK_PLUGIN_CONTAINER_MANAGER_H_