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

webkit/glue/plugins/quickdraw_drawing_manager_mac.h

 // 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.
 
-#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
 
 #import <Carbon/Carbon.h>
 
 #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 {
  public:
   QuickDrawDrawingManager();
   ~QuickDrawDrawingManager();
 
   // Sets the mode used for plugin drawing. If enabled is true the plugin draws
   // into a GWorld that's not connected to a window, otherwise the plugin draws
   // into our the plugin's dummy window (which is slower, since the call we use
@@ skipping 47 matching lines @@
   WindowRef plugin_window_;  // Weak reference.
   CGContextRef target_context_;  // Weak reference.
   gfx::Size plugin_size_;
   bool fast_path_enabled_;
   CGrafPtr current_port_;
   // Variables used for the faster path:
   GWorldPtr target_world_;  // Created lazily; may be NULL.
   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