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

webkit/glue/plugins/webplugininfo.h

Index: webkit/glue/plugins/webplugininfo.h
diff --git a/webkit/plugins/npapi/webplugininfo.h b/webkit/glue/plugins/webplugininfo.h
similarity index 87%
rename from webkit/plugins/npapi/webplugininfo.h
rename to webkit/glue/plugins/webplugininfo.h
index 6b9f240e412421c957ad8b07f88a12053afaf3af..34eff3d5ae9d2ae6910d7104e95438547e3c4fa8 100644
--- a/webkit/plugins/npapi/webplugininfo.h
+++ b/webkit/glue/plugins/webplugininfo.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_WEBPLUGININFO_H_
-#define WEBKIT_PLUGINS_NPAPI_WEBPLUGININFO_H_
+#ifndef WEBKIT_GLUE_WEBPLUGININFO_H_
+#define WEBKIT_GLUE_WEBPLUGININFO_H_
 
 #include <string>
 #include <vector>
@@ -11,9 +11,6 @@
 #include "base/basictypes.h"
 #include "base/file_path.h"
 
-namespace webkit {
-namespace npapi {
-
 // Describes a mime type entry for a plugin.
 struct WebPluginMimeType {
   WebPluginMimeType();
@@ -60,7 +57,4 @@ struct WebPluginInfo {
   bool enabled;
 };
 
-}  // namespace npapi
-}  // namespace webkit
-
-#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGININFO_H_
+#endif  // WEBKIT_GLUE_WEBPLUGININFO_H_