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

webkit/glue/plugins/plugin_list_mac.mm

Index: webkit/glue/plugins/plugin_list_mac.mm
diff --git a/webkit/plugins/npapi/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm
similarity index 95%
rename from webkit/plugins/npapi/plugin_list_mac.mm
rename to webkit/glue/plugins/plugin_list_mac.mm
index 049fe4de8005c2fcf9455ffefcee57e1d147e784..e7a23375859904c12fdb211195ce98770048a24c 100644
--- a/webkit/plugins/npapi/plugin_list_mac.mm
+++ b/webkit/glue/plugins/plugin_list_mac.mm
@@ -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"
 
 #import <Foundation/Foundation.h>
 
@@ -12,10 +12,7 @@
 #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 {
 
@@ -65,6 +62,9 @@ bool IsBlacklistedPlugin(const WebPluginInfo& info) {
 
 }  // namespace
 
+namespace NPAPI
+{
+
 void PluginList::PlatformInit() {
 }
 
@@ -106,5 +106,4 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
   return true;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+} // namespace NPAPI