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

webkit/glue/plugins/carbon_plugin_window_tracker_mac.cc

 // Copyright (c) 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.
 
-#include "webkit/plugins/npapi/carbon_plugin_window_tracker_mac.h"
-
 #include "base/logging.h"
-
-namespace webkit {
-namespace npapi {
+#include "webkit/glue/plugins/carbon_plugin_window_tracker_mac.h"
 
 CarbonPluginWindowTracker::CarbonPluginWindowTracker() {
 }
 
 CarbonPluginWindowTracker* CarbonPluginWindowTracker::SharedInstance() {
   static CarbonPluginWindowTracker* tracker = new CarbonPluginWindowTracker();
   return tracker;
 }
 
 WindowRef CarbonPluginWindowTracker::CreateDummyWindowForDelegate(
@@ skipping 29 matching lines @@
 }
 
 void CarbonPluginWindowTracker::DestroyDummyWindowForDelegate(
     OpaquePluginRef delegate, WindowRef window) {
   DCHECK(GetDelegateForDummyWindow(window) == delegate);
   window_to_delegate_map_.erase(window);
   delegate_to_window_map_.erase(delegate);
   if (window)  // Check just in case the initial window creation failed.
     DisposeWindow(window);
 }
-
-}  // namespace npapi
-}  // namespace webkit