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

webkit/glue/plugins/plugin_list_mac.mm

 // Copyright (c) 2006-2009 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"
 
 #import <Foundation/Foundation.h>
 
 #include "base/file_util.h"
 #include "base/mac_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "webkit/plugins/npapi/plugin_lib.h"
-
-namespace webkit {
-namespace npapi {
+#include "webkit/glue/plugins/plugin_lib.h"
 
 namespace {
 
 void GetPluginCommonDirectory(std::vector<FilePath>* plugin_dirs,
                               bool user) {
   // Note that there are no NSSearchPathDirectory constants for these
   // directories so we can't use Cocoa's NSSearchPathForDirectoriesInDomains().
   // Interestingly, Safari hard-codes the location (see
   // WebKit/WebKit/mac/Plugins/WebPluginDatabase.mm's +_defaultPlugInPaths).
   FSRef ref;
@@ skipping 29 matching lines @@
     return (components.size() >= 3 &&
             base::StringToInt(components[2], &bugfix_version) &&
             bugfix_version < 6);
   }
 
   return false;
 }
 
 }  // namespace
 
+namespace NPAPI
+{
+
 void PluginList::PlatformInit() {
 }
 
 void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
   // Load from the user's area
   GetPluginCommonDirectory(plugin_dirs, true);
 
   // Load from the machine-wide area
   GetPluginCommonDirectory(plugin_dirs, false);
 }
@@ skipping 21 matching lines @@
   //  encounter earlier must override plugins we encounter later)
   for (size_t i = 0; i < plugins->size(); ++i) {
     if ((*plugins)[i].path.BaseName() == info.path.BaseName()) {
       return false;  // We already have a loaded plugin higher in the hierarchy.
     }
   }
 
   return true;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+} // namespace NPAPI