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

webkit/glue/plugins/webplugin_accelerated_surface_mac.h

Index: webkit/glue/plugins/webplugin_accelerated_surface_mac.h
diff --git a/webkit/plugins/npapi/webplugin_accelerated_surface_mac.h b/webkit/glue/plugins/webplugin_accelerated_surface_mac.h
similarity index 76%
rename from webkit/plugins/npapi/webplugin_accelerated_surface_mac.h
rename to webkit/glue/plugins/webplugin_accelerated_surface_mac.h
index d26d52388f4c2542e3d836559427585aee8e25f7..13980ca73dff9e8c0cbcdf599d18f73d88ce118b 100644
--- a/webkit/plugins/npapi/webplugin_accelerated_surface_mac.h
+++ b/webkit/glue/plugins/webplugin_accelerated_surface_mac.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-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_ACCELERATED_SURFACE_MAC_H_
-#define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_ACCELERATED_SURFACE_MAC_H_
+#ifndef WEBKIT_GLUE_WEBPLUGIN_ACCELERATED_SURFACE_MAC_H_
+#define WEBKIT_GLUE_WEBPLUGIN_ACCELERATED_SURFACE_MAC_H_
 #pragma once
 
 #include "gfx/native_widget_types.h"
@@ -12,8 +12,7 @@
 // Avoid having to include OpenGL headers here.
 typedef struct _CGLContextObject* CGLContextObj;
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
 
 // Interface class for interacting with an accelerated plugin surface, used
 // for the Core Animation flavors of plugin drawing on the Mac.
@@ -40,7 +39,6 @@ class WebPluginAcceleratedSurface {
   virtual void EndDrawing() = 0;
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue
 
-#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_ACCELERATED_SURFACE_MAC_H_
+#endif  // WEBKIT_GLUE_WEBPLUGIN_ACCELERATED_SURFACE_MAC_H_