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

webkit/glue/plugins/webplugin_print_delegate.h

Index: webkit/glue/plugins/webplugin_print_delegate.h
diff --git a/webkit/plugins/npapi/webplugin_print_delegate.h b/webkit/glue/plugins/webplugin_print_delegate.h
similarity index 82%
rename from webkit/plugins/npapi/webplugin_print_delegate.h
rename to webkit/glue/plugins/webplugin_print_delegate.h
index 7c8ccf41b59ee231a8b6a2693a5ad00df681500d..24298e88c6999ae4bb13c035c429d6e1981007fc 100644
--- a/webkit/plugins/npapi/webplugin_print_delegate.h
+++ b/webkit/glue/plugins/webplugin_print_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_PRINT_DELEGATE_H_
-#define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_PRINT_DELEGATE_H_
+#ifndef WEBKIT_GLUE_PLUGINS_WEBPLUGIN_PRINT_DELEGATE_H_
+#define WEBKIT_GLUE_PLUGINS_WEBPLUGIN_PRINT_DELEGATE_H_
 
 #include "base/basictypes.h"
 #include "third_party/npapi/bindings/npapi_extensions.h"
@@ -13,8 +13,7 @@ namespace gfx {
 class Rect;
 }
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
 
 // Interface for the NPAPI print extension. This class implements "NOP"
 // versions of all these functions so it can be used seamlessly by the
@@ -38,8 +37,7 @@ class WebPluginPrintDelegate {
   virtual ~WebPluginPrintDelegate() {}
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue
 
-#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_PRINT_DELEGATE_H_
+#endif  // WEBKIT_GLUE_PLUGINS_WEBPLUGIN_PRINT_DELEGATE_H_