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

webkit/glue/plugins/plugin_list_posix.cc

Index: webkit/glue/plugins/plugin_list_posix.cc
diff --git a/webkit/plugins/npapi/plugin_list_posix.cc b/webkit/glue/plugins/plugin_list_posix.cc
similarity index 98%
rename from webkit/plugins/npapi/plugin_list_posix.cc
rename to webkit/glue/plugins/plugin_list_posix.cc
index fd5e5b7b8985bc2664adb26b60aaad9bdec57c4d..654c0c5792fc09141be47bb51ffdef7cdc8766e4 100644
--- a/webkit/plugins/npapi/plugin_list_posix.cc
+++ b/webkit/glue/plugins/plugin_list_posix.cc
@@ -2,7 +2,7 @@
 // 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_list.h"
+#include "webkit/glue/plugins/plugin_list.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ -11,9 +11,6 @@
 #include "base/string_util.h"
 #include "build/build_config.h"
 
-namespace webkit {
-namespace npapi {
-
 namespace {
 
 // We build up a list of files and mtimes so we can sort them.
@@ -103,7 +100,9 @@ bool IsBlacklistedPlugin(const FilePath& path) {
   return IsBlacklistedBySha1sum(path);
 }
 
-}  // namespace
+}  // anonymous namespace
+
+namespace NPAPI {
 
 void PluginList::PlatformInit() {
 }
@@ -268,5 +267,4 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
   return true;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI