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

webkit/glue/plugins/plugin_list_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_list.h"
+#include "webkit/glue/plugins/plugin_list.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/sha1.h"
 #include "base/string_split.h"
 #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.
 typedef std::pair<FilePath, base::Time> FileAndTime;
 typedef std::vector<FileAndTime> FileTimeList;
 
 // Comparator used to sort by descending mtime then ascending filename.
 bool CompareTime(const FileAndTime& a, const FileAndTime& b) {
   if (a.second == b.second) {
     // Fall back on filename sorting, just to make the predicate valid.
@@ skipping 69 matching lines @@
   };
   std::string filename = path.BaseName().value();
   for (size_t i = 0; i < arraysize(kBlackListedPlugins); i++) {
     if (filename.find(kBlackListedPlugins[i]) != std::string::npos) {
       return true;
     }
   }
   return IsBlacklistedBySha1sum(path);
 }
 
-}  // namespace
+}  // anonymous namespace
+
+namespace NPAPI {
 
 void PluginList::PlatformInit() {
 }
 
 void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
   // See http://groups.google.com/group/chromium-dev/browse_thread/thread/7a70e5fcbac786a9
   // for discussion.
   // We first consult Chrome-specific dirs, then fall back on the logic
   // Mozilla uses.
 
@@ skipping 144 matching lines @@
     }
   }
 
   // TODO(evanm): prefer the newest version of flash, etc. here?
 
   VLOG_IF(1, PluginList::DebugPluginLoading()) << "Using " << info.path.value();
 
   return true;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI