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

webkit/glue/plugins/webplugin.cc

Index: webkit/glue/plugins/webplugin.cc
diff --git a/webkit/plugins/npapi/webplugin.cc b/webkit/glue/plugins/webplugin.cc
similarity index 85%
rename from webkit/plugins/npapi/webplugin.cc
rename to webkit/glue/plugins/webplugin.cc
index cfe2ff15f55ff77e26b141c45ebcc4f6af1826d8..f780e18f967534014df2d86a3a424cb4f1437827 100644
--- a/webkit/plugins/npapi/webplugin.cc
+++ b/webkit/glue/plugins/webplugin.cc
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/plugins/npapi/webplugin.h"
+#include "webkit/glue/plugins/webplugin.h"
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
 
 WebPluginGeometry::WebPluginGeometry()
     : window(gfx::kNullPluginWindow),
@@ -29,5 +28,4 @@ WebPluginDelegate* WebPlugin::delegate() {
   return NULL;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue