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

webkit/glue/plugins/gtk_plugin_container.cc

Index: webkit/glue/plugins/gtk_plugin_container.cc
diff --git a/webkit/plugins/npapi/gtk_plugin_container.cc b/webkit/glue/plugins/gtk_plugin_container.cc
similarity index 94%
rename from webkit/plugins/npapi/gtk_plugin_container.cc
rename to webkit/glue/plugins/gtk_plugin_container.cc
index 056d31e51d421b2a532a47c42a29a248655e824d..c80bbf17959931d4783a09b484b473a092a0be8d 100644
--- a/webkit/plugins/npapi/gtk_plugin_container.cc
+++ b/webkit/glue/plugins/gtk_plugin_container.cc
@@ -2,15 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/plugins/npapi/gtk_plugin_container.h"
+#include "webkit/glue/plugins/gtk_plugin_container.h"
 
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
 
-namespace webkit {
-namespace npapi {
-
 namespace {
 
 // NOTE: This class doesn't have constructors/destructors, it is created
@@ -74,7 +71,7 @@ class GtkPluginContainer : public GtkSocket {
   DISALLOW_IMPLICIT_CONSTRUCTORS(GtkPluginContainer);
 };
 
-}  // namespace
+}  // anonymous namespace
 
 // Create a new instance of our GTK widget object.
 GtkWidget* gtk_plugin_container_new() {
@@ -86,6 +83,3 @@ void gtk_plugin_container_set_size(GtkWidget *widget, int width, int height) {
   // Signal the parent that the size request has changed.
   gtk_widget_queue_resize_no_redraw(widget);
 }
-
-}  // namespace npapi
-}  // namespace webkit