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

webkit/glue/plugins/quickdraw_drawing_manager_mac.h

Index: webkit/glue/plugins/quickdraw_drawing_manager_mac.h
diff --git a/webkit/plugins/npapi/quickdraw_drawing_manager_mac.h b/webkit/glue/plugins/quickdraw_drawing_manager_mac.h
similarity index 91%
rename from webkit/plugins/npapi/quickdraw_drawing_manager_mac.h
rename to webkit/glue/plugins/quickdraw_drawing_manager_mac.h
index 02d04d964e1f66e296e048c30b248a7abbfcc149..8163f92fc48275a61071b75e3f566dcd78ae3dd1 100644
--- a/webkit/plugins/npapi/quickdraw_drawing_manager_mac.h
+++ b/webkit/glue/plugins/quickdraw_drawing_manager_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_QUICKDRAW_DRAWING_MANAGER_MAC_H_
-#define WEBKIT_PLUGINS_NPAPI_QUICKDRAW_DRAWING_MANAGER_MAC_H_
+#ifndef WEBKIT_GLUE_QUICKDRAW_DRAWING_MANAGER_MAC_H_
+#define WEBKIT_GLUE_QUICKDRAW_DRAWING_MANAGER_MAC_H_
 
 #ifndef NP_NO_QUICKDRAW
 
@@ -11,9 +11,6 @@
 
 #include "gfx/rect.h"
 
-namespace webkit {
-namespace npapi {
-
 // Plugin helper class encapsulating the details of capturing what a QuickDraw
 // drawing model plugin draws, then drawing it into a CGContext.
 class QuickDrawDrawingManager {
@@ -81,9 +78,6 @@ class QuickDrawDrawingManager {
   GWorldPtr plugin_world_;  // Created lazily; may be NULL.
 };
 
-}  // namespace npapi
-}  // namespace webkit
-
 #endif  // !NP_NO_QUICKDRAW
 
-#endif  // WEBKIT_PLUGINS_NPAPI_QUICKDRAW_DRAWING_MANAGER_MAC_H_
+#endif  // QUICKDRAW_DRAWING_MANAGER_MAC