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

webkit/glue/plugins/carbon_plugin_window_tracker_mac.cc

Index: webkit/glue/plugins/carbon_plugin_window_tracker_mac.cc
diff --git a/webkit/plugins/npapi/carbon_plugin_window_tracker_mac.cc b/webkit/glue/plugins/carbon_plugin_window_tracker_mac.cc
similarity index 92%
rename from webkit/plugins/npapi/carbon_plugin_window_tracker_mac.cc
rename to webkit/glue/plugins/carbon_plugin_window_tracker_mac.cc
index d652c9cd112b6dce809e5984ffc4822dc7b185ef..c4ae72d931a02c5f4f013cf057341351a987d93c 100644
--- a/webkit/plugins/npapi/carbon_plugin_window_tracker_mac.cc
+++ b/webkit/glue/plugins/carbon_plugin_window_tracker_mac.cc
@@ -2,12 +2,8 @@
 // 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() {
 }
@@ -57,6 +53,3 @@ void CarbonPluginWindowTracker::DestroyDummyWindowForDelegate(
   if (window)  // Check just in case the initial window creation failed.
     DisposeWindow(window);
 }
-
-}  // namespace npapi
-}  // namespace webkit