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

webkit/glue/plugins/plugin_host.h

Index: webkit/glue/plugins/plugin_host.h
diff --git a/webkit/plugins/npapi/plugin_host.h b/webkit/glue/plugins/plugin_host.h
similarity index 89%
rename from webkit/plugins/npapi/plugin_host.h
rename to webkit/glue/plugins/plugin_host.h
index f6359c56db99613d448ede1d5492ce4898e38e97..4763df1a7f8e892772f3be7e25bce9177b965956 100644
--- a/webkit/plugins/npapi/plugin_host.h
+++ b/webkit/glue/plugins/plugin_host.h
@@ -4,8 +4,8 @@
 
 // TODO: Need mechanism to cleanup the static instance
 
-#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_HOST_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGIN_HOST_H_
+#ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_HOST_H__
+#define WEBKIT_GLUE_PLUGIN_PLUGIN_HOST_H__
 
 #include <string>
 #include <vector>
@@ -14,9 +14,8 @@
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/nphostapi.h"
 
-namespace webkit {
-namespace npapi {
-
+namespace NPAPI
+{
 class PluginInstance;
 
 // The Plugin Host implements the NPN_xxx functions for NPAPI plugins.
@@ -59,7 +58,6 @@ class PluginHost : public base::RefCounted<PluginHost> {
   DISALLOW_COPY_AND_ASSIGN(PluginHost);
 };
 
-}  // namespace npapi
-}  // namespace webkit
+} // namespace NPAPI
 
-#endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_HOST_H_
+#endif  // WEBKIT_GLUE_PLUGIN_PLUGIN_HOST_H__