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

webkit/glue/plugins/quickdraw_drawing_manager_mac.cc

Index: webkit/glue/plugins/quickdraw_drawing_manager_mac.cc
diff --git a/webkit/plugins/npapi/quickdraw_drawing_manager_mac.cc b/webkit/glue/plugins/quickdraw_drawing_manager_mac.cc
similarity index 95%
rename from webkit/plugins/npapi/quickdraw_drawing_manager_mac.cc
rename to webkit/glue/plugins/quickdraw_drawing_manager_mac.cc
index 26db55db192e3f43bd5b3381ce6f9d39185c27cd..424cc1ec5fa0e4d173926bd72e8de2900fae8542 100644
--- a/webkit/plugins/npapi/quickdraw_drawing_manager_mac.cc
+++ b/webkit/glue/plugins/quickdraw_drawing_manager_mac.cc
@@ -4,18 +4,15 @@
 
 #ifndef NP_NO_QUICKDRAW
 
-#include "webkit/plugins/npapi/quickdraw_drawing_manager_mac.h"
+#include "webkit/glue/plugins/quickdraw_drawing_manager_mac.h"
 
-#include "webkit/plugins/npapi/coregraphics_private_symbols_mac.h"
+#include "webkit/glue/plugins/coregraphics_private_symbols_mac.h"
 
 // Turn off GCC warnings about deprecated functions (since QuickDraw is a
 // deprecated API). According to the GCC documentation, this can only be done
 // per file, not pushed and popped like some options can be.
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
-namespace webkit {
-namespace npapi {
-
 QuickDrawDrawingManager::QuickDrawDrawingManager()
     : plugin_window_(NULL), target_context_(NULL), fast_path_enabled_(false),
       current_port_(NULL), target_world_(NULL), plugin_world_(NULL) {}
@@ -154,7 +151,4 @@ void QuickDrawDrawingManager::CopyGWorldBits(GWorldPtr source, GWorldPtr dest,
   }
 }
 
-}  // namespace npapi
-}  // namespace webkit
-
 #endif  // !NP_NO_QUICKDRAW