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

webkit/glue/plugins/gtk_plugin_container_manager.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // 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) {}
 
 GtkPluginContainerManager::~GtkPluginContainerManager() {}
 
 GtkWidget* GtkPluginContainerManager::CreatePluginContainer(
     gfx::PluginWindowHandle id) {
   DCHECK(host_widget_);
   GtkWidget *widget = gtk_plugin_container_new();
   plugin_window_to_widget_map_.insert(std::make_pair(id, widget));
@@ skipping 26 matching lines @@
     gfx::PluginWindowHandle id) {
   DCHECK(host_widget_);
   GtkWidget* widget = MapIDToWidget(id);
   if (widget)
     gtk_widget_destroy(widget);
 
   plugin_window_to_widget_map_.erase(id);
 }
 
 void GtkPluginContainerManager::MovePluginContainer(
-    const WebPluginGeometry& move) {
+    const webkit_glue::WebPluginGeometry& move) {
   DCHECK(host_widget_);
   GtkWidget *widget = MapIDToWidget(move.window);
   if (!widget)
     return;
 
   DCHECK(!GTK_WIDGET_NO_WINDOW(widget));
 
   if (!move.visible) {
     gtk_widget_hide(widget);
     return;
@@ skipping 76 matching lines @@
 // static
 void GtkPluginContainerManager::RealizeCallback(GtkWidget* widget,
                                                 void* user_data) {
   GtkPluginContainerManager* plugin_container_manager =
       static_cast<GtkPluginContainerManager*>(user_data);
 
   gfx::PluginWindowHandle id = plugin_container_manager->MapWidgetToID(widget);
   if (id)
     gtk_socket_add_id(GTK_SOCKET(widget), id);
 }
-
-}  // namespace npapi
-}  // namespace webkit