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

webkit/glue/plugins/plugin_lib_win.cc

Index: webkit/glue/plugins/plugin_lib_win.cc
diff --git a/webkit/plugins/npapi/plugin_lib_win.cc b/webkit/glue/plugins/plugin_lib_win.cc
similarity index 87%
rename from webkit/plugins/npapi/plugin_lib_win.cc
rename to webkit/glue/plugins/plugin_lib_win.cc
index 6132d45a0d46f46eb507eee13fb89813a32882d9..382c2c89d213bea5425c5d503edbbfc563d499cd 100644
--- a/webkit/plugins/npapi/plugin_lib_win.cc
+++ b/webkit/glue/plugins/plugin_lib_win.cc
@@ -2,17 +2,16 @@
 // 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 "base/file_version_info.h"
 #include "base/file_version_info_win.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "webkit/plugins/npapi/plugin_constants_win.h"
-#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/glue/plugins/plugin_constants_win.h"
+#include "webkit/glue/plugins/plugin_list.h"
 
-namespace webkit {
-namespace npapi {
+namespace NPAPI {
 
 bool PluginLib::ReadWebPluginInfo(const FilePath &filename,
                                   WebPluginInfo* info) {
@@ -44,5 +43,4 @@ bool PluginLib::ReadWebPluginInfo(const FilePath &filename,
   return PluginList::CreateWebPluginInfo(pvi, info);
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI