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

webkit/glue/plugins/webplugin_2d_device_delegate.h

Index: webkit/glue/plugins/webplugin_2d_device_delegate.h
diff --git a/webkit/plugins/npapi/webplugin_2d_device_delegate.h b/webkit/glue/plugins/webplugin_2d_device_delegate.h
similarity index 86%
rename from webkit/plugins/npapi/webplugin_2d_device_delegate.h
rename to webkit/glue/plugins/webplugin_2d_device_delegate.h
index 094ddc54e0a57abc685551a38507044863dd3455..e18c2fdfde24f27c04f35b72ce6db06e6f9a8cbc 100644
--- a/webkit/plugins/npapi/webplugin_2d_device_delegate.h
+++ b/webkit/glue/plugins/webplugin_2d_device_delegate.h
@@ -2,14 +2,13 @@
 // 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_2D_DEVICE_DELEGATE_H_
-#define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_2D_DEVICE_DELEGATE_H_
+#ifndef WEBKIT_GLUE_PLUGINS_WEBPLUGIN_2D_DEVICE_DELEGATE_H_
+#define WEBKIT_GLUE_PLUGINS_WEBPLUGIN_2D_DEVICE_DELEGATE_H_
 
 #include "base/basictypes.h"
 #include "third_party/npapi/bindings/npapi_extensions.h"
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
 
 // Interface for the NPAPI 2D device extension. This class implements "NOP"
 // versions of all these functions so it can be used seamlessly by the
@@ -39,7 +38,6 @@ class WebPlugin2DDeviceDelegate {
   virtual ~WebPlugin2DDeviceDelegate() {}
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue
 
-#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_2D_DEVICE_DELEGATE_H_
+#endif  // WEBKIT_GLUE_PLUGINS_WEBPLUGIN_2D_DEVICE_DELEGATE_H_