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

webkit/glue/plugins/webplugin_3d_device_delegate.cc

Index: webkit/glue/plugins/webplugin_3d_device_delegate.cc
diff --git a/webkit/plugins/npapi/webplugin_3d_device_delegate.cc b/webkit/glue/plugins/webplugin_3d_device_delegate.cc
similarity index 95%
rename from webkit/plugins/npapi/webplugin_3d_device_delegate.cc
rename to webkit/glue/plugins/webplugin_3d_device_delegate.cc
index 132b6d06a0c8fdf3f56cdc3b0a829f2104fa2aee..93dffa60a561e88dff2a4d4f8e12cf0fff2dc0be 100644
--- a/webkit/plugins/npapi/webplugin_3d_device_delegate.cc
+++ b/webkit/glue/plugins/webplugin_3d_device_delegate.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_3d_device_delegate.h"
+#include "webkit/glue/plugins/webplugin_3d_device_delegate.h"
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
 
 NPError WebPlugin3DDeviceDelegate::Device3DQueryCapability(int32 capability,
                                                            int32* value) {
@@ -106,6 +105,6 @@ NPError WebPlugin3DDeviceDelegate::Device3DSynchronizeContext(
   return NPERR_GENERIC_ERROR;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+
+}  // namespace webkit_glue