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

webkit/glue/plugins/plugin_lib.cc

Index: webkit/glue/plugins/plugin_lib.cc
diff --git a/webkit/plugins/npapi/plugin_lib.cc b/webkit/glue/plugins/plugin_lib.cc
similarity index 97%
rename from webkit/plugins/npapi/plugin_lib.cc
rename to webkit/glue/plugins/plugin_lib.cc
index d801ee0351e7331af2f17b3f9f694913e82ce41f..4ae4da4ece64c3b4c2675d944959deaeaee37d39 100644
--- a/webkit/plugins/npapi/plugin_lib.cc
+++ b/webkit/glue/plugins/plugin_lib.cc
@@ -2,19 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/plugins/npapi/plugin_lib.h"
+#include "webkit/glue/plugins/plugin_lib.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
 #include "base/string_util.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
-#include "webkit/plugins/npapi/plugin_host.h"
-#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/glue/plugins/plugin_instance.h"
+#include "webkit/glue/plugins/plugin_host.h"
+#include "webkit/glue/plugins/plugin_list.h"
 
-namespace webkit {
-namespace npapi {
+namespace NPAPI {
 
 const char kPluginLibrariesLoadedCounter[] = "PluginLibrariesLoaded";
 const char kPluginInstancesActiveCounter[] = "PluginInstancesActive";
@@ -347,5 +346,4 @@ void PluginLib::Shutdown() {
   }
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI