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

webkit/glue/plugins/webplugininfo.cc

Index: webkit/glue/plugins/webplugininfo.cc
diff --git a/webkit/plugins/npapi/webplugininfo.cc b/webkit/glue/plugins/webplugininfo.cc
similarity index 89%
rename from webkit/plugins/npapi/webplugininfo.cc
rename to webkit/glue/plugins/webplugininfo.cc
index c055953044c0bc1e449db61c4d365383a7b403a6..7d2b4e447e6c32c3ce733f3d14e71f13c585e271 100644
--- a/webkit/plugins/npapi/webplugininfo.cc
+++ b/webkit/glue/plugins/webplugininfo.cc
@@ -2,10 +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/webplugininfo.h"
-
-namespace webkit {
-namespace npapi {
+#include "webkit/glue/plugins/webplugininfo.h"
 
 WebPluginMimeType::WebPluginMimeType() {}
 
@@ -45,6 +42,3 @@ WebPluginInfo::WebPluginInfo(const string16& fake_name,
       enabled(true) {
 }
 
-}  // namespace npapi
-}  // namespace webkit
-