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

webkit/glue/plugins/webplugin_3d_device_delegate.h

 // Copyright (c) 2009 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.
 
-#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
 // "regular" plugin delegate while being overridden by the "pepper" one.
 class WebPlugin3DDeviceDelegate {
  public:
   virtual NPError Device3DQueryCapability(int32 capability, int32* value);
   virtual NPError Device3DQueryConfig(const NPDeviceContext3DConfig* request,
                                       NPDeviceContext3DConfig* obtain);
   virtual NPError Device3DInitializeContext(
@@ skipping 37 matching lines @@
       const int32* input_attrib_list,
       int32* output_attrib_list,
       NPDeviceSynchronizeContextCallbackPtr callback,
       void* callback_data);
 
  protected:
   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_