Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put...

webkit/plugins/npapi/plugin_stream_url.h

Index: webkit/plugins/npapi/plugin_stream_url.h
===================================================================
--- webkit/plugins/npapi/plugin_stream_url.h	(revision 0)
+++ webkit/plugins/npapi/plugin_stream_url.h	(working copy)
@@ -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_GLUE_PLUGIN_PLUGIN_STREAM_URL_H__
-#define WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_URL_H__
+#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_STREAM_URL_H_
+#define WEBKIT_PLUGINS_NPAPI_PLUGIN_STREAM_URL_H_
 
-
-#include "webkit/glue/plugins/plugin_stream.h"
-#include "webkit/glue/plugins/webplugin.h"
+#include "webkit/plugins/npapi/plugin_stream.h"
+#include "webkit/plugins/npapi/webplugin.h"
 #include "googleurl/src/gurl.h"
 
-namespace NPAPI {
+namespace webkit {
+namespace npapi {
 
 class PluginInstance;
 
 // A NPAPI Stream based on a URL.
 class PluginStreamUrl : public PluginStream,
-                        public webkit_glue::WebPluginResourceClient {
+                        public 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 @@
   // it is still loading.
   virtual bool Close(NPReason reason);
 
-  virtual webkit_glue::WebPluginResourceClient* AsResourceClient();
+  virtual WebPluginResourceClient* AsResourceClient();
 
   virtual void CancelRequest();
 
@@ -60,6 +60,7 @@
   DISALLOW_COPY_AND_ASSIGN(PluginStreamUrl);
 };
 
-} // namespace NPAPI
+}  // namespace npapi
+}  // namespace webkit
 
-#endif // WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_URL_H__
+#endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_STREAM_URL_H_