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

webkit/glue/plugins/webplugin_2d_device_delegate.cc

Index: webkit/glue/plugins/webplugin_2d_device_delegate.cc
diff --git a/webkit/plugins/npapi/webplugin_2d_device_delegate.cc b/webkit/glue/plugins/webplugin_2d_device_delegate.cc
similarity index 90%
rename from webkit/plugins/npapi/webplugin_2d_device_delegate.cc
rename to webkit/glue/plugins/webplugin_2d_device_delegate.cc
index d5a709e95d9e54586514384f97cdd3ebebc00642..f971e20d0fd510cc1644ab6859c2a328fbb70c92 100644
--- a/webkit/plugins/npapi/webplugin_2d_device_delegate.cc
+++ b/webkit/glue/plugins/webplugin_2d_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_2d_device_delegate.h"
+#include "webkit/glue/plugins/webplugin_2d_device_delegate.h"
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
 
 NPError WebPlugin2DDeviceDelegate::Device2DQueryCapability(int32 capability,
                                                            int32* value) {
@@ -51,5 +50,4 @@ NPError WebPlugin2DDeviceDelegate::Device2DDestroyContext(
   return NPERR_GENERIC_ERROR;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue