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

webkit/glue/plugins/quickdraw_drawing_manager_mac.cc

 // 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 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) {}
 
 QuickDrawDrawingManager::~QuickDrawDrawingManager() {
   DestroyGWorlds();
 }
 
 void QuickDrawDrawingManager::SetFastPathEnabled(bool enabled) {
   if (fast_path_enabled_ == enabled)
@@ skipping 118 matching lines @@
       BackColor(whiteColor);
       CopyBits(reinterpret_cast<BitMap*>(*source_pixmap),
                reinterpret_cast<BitMap*>(*dest_pixmap),
                &window_bounds, &window_bounds, srcCopy, NULL);
       UnlockPixels(dest_pixmap);
     }
     UnlockPixels(source_pixmap);
   }
 }
 
-}  // namespace npapi
-}  // namespace webkit
-
 #endif  // !NP_NO_QUICKDRAW