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

webkit/glue/plugins/webplugin_2d_device_delegate.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // 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) {
   return NPERR_GENERIC_ERROR;
 }
 
 NPError WebPlugin2DDeviceDelegate::Device2DQueryConfig(
     const NPDeviceContext2DConfig* request,
     NPDeviceContext2DConfig* obtain) {
   return NPERR_GENERIC_ERROR;
@@ skipping 25 matching lines @@
     NPDeviceFlushContextCallbackPtr callback,
     void* user_data) {
   return NPERR_GENERIC_ERROR;
 }
 
 NPError WebPlugin2DDeviceDelegate::Device2DDestroyContext(
     NPDeviceContext2D* context) {
   return NPERR_GENERIC_ERROR;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue