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

webkit/glue/plugins/gtk_plugin_container.h

Index: webkit/glue/plugins/gtk_plugin_container.h
diff --git a/webkit/plugins/npapi/gtk_plugin_container.h b/webkit/glue/plugins/gtk_plugin_container.h
similarity index 78%
rename from webkit/plugins/npapi/gtk_plugin_container.h
rename to webkit/glue/plugins/gtk_plugin_container.h
index aee11c27974df36b4eab9c2c2ffb96d86c64449f..eed6b94471bdc62be1a0d5feb51df5e42d05c98f 100644
--- a/webkit/plugins/npapi/gtk_plugin_container.h
+++ b/webkit/glue/plugins/gtk_plugin_container.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_H_
-#define WEBKIT_PLUGINS_NPAPI_GTK_PLUGIN_CONTAINER_H_
+#ifndef WEBKIT_GLUE_PLUGINS_GTK_PLUGIN_CONTAINER_H_
+#define WEBKIT_GLUE_PLUGINS_GTK_PLUGIN_CONTAINER_H_
 
 // Windowed plugins are embedded via XEmbed, which is implemented by
 // GtkPlug/GtkSocket.  But we want to control sizing and positioning
@@ -15,9 +15,6 @@
 
 typedef struct _GtkWidget GtkWidget;
 
-namespace webkit {
-namespace npapi {
-
 // Return a new GtkPluginContainer.
 // Intentionally GTK-style here since we're creating a custom GTK widget.
 // This is a GtkSocket subclass; see its documentation for available methods.
@@ -26,7 +23,4 @@ GtkWidget* gtk_plugin_container_new();
 // Sets the size of the GtkPluginContainer.
 void gtk_plugin_container_set_size(GtkWidget *widget, int width, int height);
 
-}  // namespace npapi
-}  // namespace webkit
-
-#endif  // WEBKIT_PLUGINS_NPAPI_GTK_PLUGIN_CONTAINER_H_
+#endif  // WEBKIT_GLUE_PLUGINS_GTK_PLUGIN_CONTAINER_H_