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

webkit/glue/plugins/gtk_plugin_container_manager.cc

Index: webkit/glue/plugins/gtk_plugin_container_manager.cc
diff --git a/webkit/plugins/npapi/gtk_plugin_container_manager.cc b/webkit/glue/plugins/gtk_plugin_container_manager.cc
similarity index 94%
rename from webkit/plugins/npapi/gtk_plugin_container_manager.cc
rename to webkit/glue/plugins/gtk_plugin_container_manager.cc
index 5b9876adf9120c3b27c90b06c032cf48eaf97235..2f82b24011d34d8be2096cc824ad66722ddf4e3c 100644
--- a/webkit/plugins/npapi/gtk_plugin_container_manager.cc
+++ b/webkit/glue/plugins/gtk_plugin_container_manager.cc
@@ -2,17 +2,14 @@
 // 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_manager.h"
+#include "webkit/glue/plugins/gtk_plugin_container_manager.h"
 
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "gfx/gtk_util.h"
-#include "webkit/plugins/npapi/gtk_plugin_container.h"
-#include "webkit/plugins/npapi/webplugin.h"
-
-namespace webkit {
-namespace npapi {
+#include "webkit/glue/plugins/gtk_plugin_container.h"
+#include "webkit/glue/plugins/webplugin.h"
 
 GtkPluginContainerManager::GtkPluginContainerManager() : host_widget_(NULL) {}
 
@@ -59,7 +56,7 @@ void GtkPluginContainerManager::DestroyPluginContainer(
 }
 
 void GtkPluginContainerManager::MovePluginContainer(
-    const WebPluginGeometry& move) {
+    const webkit_glue::WebPluginGeometry& move) {
   DCHECK(host_widget_);
   GtkWidget *widget = MapIDToWidget(move.window);
   if (!widget)
@@ -156,6 +153,3 @@ void GtkPluginContainerManager::RealizeCallback(GtkWidget* widget,
   if (id)
     gtk_socket_add_id(GTK_SOCKET(widget), id);
 }
-
-}  // namespace npapi
-}  // namespace webkit