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

webkit/glue/plugins/plugin_stream_url.h

Index: webkit/glue/plugins/plugin_stream_url.h
diff --git a/webkit/plugins/npapi/plugin_stream_url.h b/webkit/glue/plugins/plugin_stream_url.h
similarity index 79%
rename from webkit/plugins/npapi/plugin_stream_url.h
rename to webkit/glue/plugins/plugin_stream_url.h
index 312f8de65386924888f7b2baf74cb0a3040be24d..8642897fc12ed2763a92485b6f3757fec32d7720 100644
--- a/webkit/plugins/npapi/plugin_stream_url.h
+++ b/webkit/glue/plugins/plugin_stream_url.h
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_STREAM_URL_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGIN_STREAM_URL_H_
+#ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_URL_H__
+#define WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_URL_H__
 
-#include "webkit/plugins/npapi/plugin_stream.h"
-#include "webkit/plugins/npapi/webplugin.h"
+
+#include "webkit/glue/plugins/plugin_stream.h"
+#include "webkit/glue/plugins/webplugin.h"
 #include "googleurl/src/gurl.h"
 
-namespace webkit {
-namespace npapi {
+namespace NPAPI {
 
 class PluginInstance;
 
 // A NPAPI Stream based on a URL.
 class PluginStreamUrl : public PluginStream,
-                        public WebPluginResourceClient {
+                        public webkit_glue::WebPluginResourceClient {
  public:
   // Create a new stream for sending to the plugin by fetching
   // a URL. If notifyNeeded is set, then the plugin will be notified
@@ -34,7 +34,7 @@ class PluginStreamUrl : public PluginStream,
   // it is still loading.
   virtual bool Close(NPReason reason);
 
-  virtual WebPluginResourceClient* AsResourceClient();
+  virtual webkit_glue::WebPluginResourceClient* AsResourceClient();
 
   virtual void CancelRequest();
 
@@ -60,7 +60,6 @@ class PluginStreamUrl : public PluginStream,
   DISALLOW_COPY_AND_ASSIGN(PluginStreamUrl);
 };
 
-}  // namespace npapi
-}  // namespace webkit
+} // namespace NPAPI
 
-#endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_STREAM_URL_H_
+#endif // WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_URL_H__