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

webkit/glue/plugins/carbon_plugin_window_tracker_mac.h

Index: webkit/glue/plugins/carbon_plugin_window_tracker_mac.h
diff --git a/webkit/plugins/npapi/carbon_plugin_window_tracker_mac.h b/webkit/glue/plugins/carbon_plugin_window_tracker_mac.h
similarity index 87%
rename from webkit/plugins/npapi/carbon_plugin_window_tracker_mac.h
rename to webkit/glue/plugins/carbon_plugin_window_tracker_mac.h
index 65d12c8ddf8e256274c65230810652fd89436adc..90fc318561202c9448b2414569a317ee8f2a1e15 100644
--- a/webkit/plugins/npapi/carbon_plugin_window_tracker_mac.h
+++ b/webkit/glue/plugins/carbon_plugin_window_tracker_mac.h
@@ -2,17 +2,14 @@
 // 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;
@@ -53,7 +50,4 @@ class __attribute__((visibility("default"))) CarbonPluginWindowTracker {
   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_