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

webkit/glue/plugins/gtk_plugin_container.cc

 // Copyright (c) 2009 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.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
 // through GLib's object management.
 class GtkPluginContainer : public GtkSocket {
  public:
   // Sets the requested size of the widget.
   void set_size(int width, int height) {
     width_ = width;
     height_ = height;
@@ skipping 43 matching lines @@
     GtkPluginContainer *container = CastChecked(widget);
     requisition->width = container->width_;
     requisition->height = container->height_;
   }
 
   int width_;
   int height_;
   DISALLOW_IMPLICIT_CONSTRUCTORS(GtkPluginContainer);
 };
 
-}  // namespace
+}  // anonymous namespace
 
 // Create a new instance of our GTK widget object.
 GtkWidget* gtk_plugin_container_new() {
   return GTK_WIDGET(g_object_new(GtkPluginContainer::GetType(), NULL));
 }
 
 void gtk_plugin_container_set_size(GtkWidget *widget, int width, int height) {
   GtkPluginContainer::CastChecked(widget)->set_size(width, height);
   // Signal the parent that the size request has changed.
   gtk_widget_queue_resize_no_redraw(widget);
 }
-
-}  // namespace npapi
-}  // namespace webkit