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

webkit/glue/plugins/default_plugin_shared.h

Index: webkit/glue/plugins/default_plugin_shared.h
diff --git a/webkit/plugins/npapi/default_plugin_shared.h b/webkit/glue/plugins/default_plugin_shared.h
similarity index 76%
rename from webkit/plugins/npapi/default_plugin_shared.h
rename to webkit/glue/plugins/default_plugin_shared.h
index e1ab65973a376124c18359ddcc310e43ff5eb47a..79d06b3dc33f0a7bf038f2218565950d5830c765 100644
--- a/webkit/plugins/npapi/default_plugin_shared.h
+++ b/webkit/glue/plugins/default_plugin_shared.h
@@ -5,11 +5,8 @@
 // Thes file contains stuff that should be shared among projects that do some
 // special handling with default plugin
 
-#ifndef WEBKIT_PLUGINS_NPAPI_DEFAULT_PLUGIN_SHARED_H
-#define WEBKIT_PLUGINS_NPAPI_DEFAULT_PLUGIN_SHARED_H
-
-namespace webkit {
-namespace npapi {
+#ifndef WEBKIT_GLUE_PLUGINS_DEFAULT_PLUGIN_SHARED_H
+#define WEBKIT_GLUE_PLUGINS_DEFAULT_PLUGIN_SHARED_H
 
 namespace default_plugin {
 
@@ -31,7 +28,4 @@ const int kInstallMissingPluginMessage = WM_APP + 117;
 
 }  // namespace default_plugin
 
-}  // namespace npapi
-}  // namespace webkit
-
-#endif // WEBKIT_PLUGINS_NPAPI_DEFAULT_PLUGIN_SHARED_H
+#endif // WEBKIT_GLUE_PLUGINS_DEFAULT_PLUGIN_SHARED_H