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

webkit/glue/plugins/plugin_lib_posix.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // 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)
 #include <sys/exec_elf.h>
 #else
 #include <elf.h>
 #include <fcntl.h>
 #endif
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "base/eintr_wrapper.h"
 #include "base/file_util.h"
 #include "base/string_split.h"
 #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 {
 
-namespace {
+using NPAPI::PluginList;
 
 // Copied from nsplugindefs.h instead of including the file since it has a bunch
 // of dependencies.
 enum nsPluginVariable {
   nsPluginVariable_NameString        = 1,
   nsPluginVariable_DescriptionString = 2
 };
 
 // Read the ELF header and return true if it is usable on
 // the current architecture (e.g. 32-bit ELF on 32-bit build).
@@ skipping 84 matching lines @@
 
   // Unload the wrapped plugin, and use the wrapped plugin instead.
   LOG_IF(ERROR, PluginList::DebugPluginLoading())
       << "Using unwrapped version " << unwrapped_path->value()
       << " of nspluginwrapper-wrapped plugin.";
   base::UnloadNativeLibrary(*dl);
   *dl = newdl;
   *unwrapped_path = path;
 }
 
-}  // namespace
+}  // anonymous namespace
+
+namespace NPAPI {
 
 bool PluginLib::ReadWebPluginInfo(const FilePath& filename,
                                   WebPluginInfo* info) {
   // The file to reference is:
   // http://mxr.mozilla.org/firefox/source/modules/plugin/base/src/nsPluginsDirUnix.cpp
 
   // Skip files that aren't appropriate for our architecture.
   if (!ELFMatchesCurrentArchitecture(filename)) {
     LOG_IF(ERROR, PluginList::DebugPluginLoading())
         << "Skipping plugin " << filename.value()
@@ skipping 96 matching lines @@
     } else {
       mime_type.description = UTF8ToUTF16(description.substr(ofs));
     }
     mime_types->push_back(mime_type);
     if (end == std::string::npos)
       break;
     ofs = end + 1;
   }
 }
 
-
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI