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

webkit/glue/plugins/webplugin_3d_device_delegate.h

Index: webkit/glue/plugins/webplugin_3d_device_delegate.h
diff --git a/webkit/plugins/npapi/webplugin_3d_device_delegate.h b/webkit/glue/plugins/webplugin_3d_device_delegate.h
similarity index 91%
rename from webkit/plugins/npapi/webplugin_3d_device_delegate.h
rename to webkit/glue/plugins/webplugin_3d_device_delegate.h
index 45c94aafd700e020834f87219294fc76f219de27..2f64b452e42b7c4e9e4c68ea0447dc45549c2270 100644
--- a/webkit/plugins/npapi/webplugin_3d_device_delegate.h
+++ b/webkit/glue/plugins/webplugin_3d_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_3D_DEVICE_DELEGATE_H_
-#define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_3D_DEVICE_DELEGATE_H_
+#ifndef WEBKIT_GLUE_PLUGINS_WEBPLUGIN_3D_DEVICE_DELEGATE_H_
+#define WEBKIT_GLUE_PLUGINS_WEBPLUGIN_3D_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 3D device extension. This class implements "NOP"
 // versions of all these functions so it can be used seamlessly by the
@@ -67,7 +66,6 @@ class WebPlugin3DDeviceDelegate {
   virtual ~WebPlugin3DDeviceDelegate() {}
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue
 
-#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_3D_DEVICE_DELEGATE_H_
+#endif  // WEBKIT_GLUE_PLUGINS_WEBPLUGIN_3D_DEVICE_DELEGATE_H_