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

webkit/glue/plugins/carbon_plugin_window_tracker_mac.h

 // 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.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_CARBON_PLUGIN_WINDOW_TRACKER_MAC_H_
-#define WEBKIT_PLUGINS_NPAPI_CARBON_PLUGIN_WINDOW_TRACKER_MAC_H_
+#ifndef WEBKIT_GLUE_PLUGINS_CARBON_PLUGIN_WINDOW_TRACKER_MAC_H_
+#define WEBKIT_GLUE_PLUGINS_CARBON_PLUGIN_WINDOW_TRACKER_MAC_H_
 
 #include <Carbon/Carbon.h>
 #include <map>
 
 #include "base/basictypes.h"
 
-namespace webkit {
-namespace npapi {
-
 // This is really a WebPluginDelegateImpl, but that class is private to the
 // framework, and these functions are called from a dylib.
 typedef void* OpaquePluginRef;
 
 // Creates and tracks the invisible windows that are necessary for
 // Carbon-event-model plugins.
 //
 // Serves as a bridge between plugin delegate instances and the Carbon
 // interposing library. The Carbon functions we interpose work in terms of
 // WindowRefs, and we need to be able to map from those back to the plugin
@@ skipping 20 matching lines @@
 
  private:
   typedef std::map<WindowRef, OpaquePluginRef> WindowToDelegateMap;
   typedef std::map<OpaquePluginRef, WindowRef> DelegateToWindowMap;
   WindowToDelegateMap window_to_delegate_map_;
   DelegateToWindowMap delegate_to_window_map_;
 
   DISALLOW_COPY_AND_ASSIGN(CarbonPluginWindowTracker);
 };
 
-}  // namespace npapi
-}  // namespace webkit
-
-#endif  // WEBKIT_PLUGINS_NPAPI_CARBON_PLUGIN_WINDOW_TRACKER_MAC_H_
+#endif  // WEBKIT_GLUE_PLUGINS_CARBON_PLUGIN_WINDOW_TRACKER_MAC_H_