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

webkit/glue/plugins/plugin_lib_posix.cc

Index: webkit/glue/plugins/plugin_lib_posix.cc
diff --git a/webkit/plugins/npapi/plugin_lib_posix.cc b/webkit/glue/plugins/plugin_lib_posix.cc
similarity index 97%
rename from webkit/plugins/npapi/plugin_lib_posix.cc
rename to webkit/glue/plugins/plugin_lib_posix.cc
index 19fa1415ae6d87d26ef676e67ced08a2b2060476..ac937e1a8d69d8a19ebc4c04ad432c846a120293 100644
--- a/webkit/plugins/npapi/plugin_lib_posix.cc
+++ b/webkit/glue/plugins/plugin_lib_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_lib.h"
+#include "webkit/glue/plugins/plugin_lib.h"
 
 #include <dlfcn.h>
 #if defined(OS_OPENBSD)
@@ -21,17 +21,16 @@
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/glue/plugins/plugin_list.h"
 
 // These headers must be included in this order to make the declaration gods
 // happy.
 #include "base/third_party/nspr/prcpucfg_linux.h"
 
-namespace webkit {
-namespace npapi {
-
 namespace {
 
+using NPAPI::PluginList;
+
 // Copied from nsplugindefs.h instead of including the file since it has a bunch
 // of dependencies.
 enum nsPluginVariable {
@@ -135,7 +134,9 @@ void UnwrapNSPluginWrapper(void **dl, FilePath* unwrapped_path) {
   *unwrapped_path = path;
 }
 
-}  // namespace
+}  // anonymous namespace
+
+namespace NPAPI {
 
 bool PluginLib::ReadWebPluginInfo(const FilePath& filename,
                                   WebPluginInfo* info) {
@@ -252,6 +253,4 @@ void PluginLib::ParseMIMEDescription(
   }
 }
 
-
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI