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

webkit/plugins/npapi/plugin_stream_url.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // 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
   // when the stream has been fully sent to the plugin.  Initialize
   // must be called before the object is used.
   PluginStreamUrl(unsigned long resource_id,
                   const GURL &url,
                   PluginInstance *instance,
                   bool notify_needed,
                   void *notify_data);
   virtual ~PluginStreamUrl();
 
   // Stop sending the stream to the client.
   // Overrides the base Close so we can cancel our fetching the URL if
   // it is still loading.
   virtual bool Close(NPReason reason);
 
-  virtual webkit_glue::WebPluginResourceClient* AsResourceClient();
+  virtual WebPluginResourceClient* AsResourceClient();
 
   virtual void CancelRequest();
 
   //
   // WebPluginResourceClient methods
   //
   virtual void WillSendRequest(const GURL& url, int http_status_code);
   virtual void DidReceiveResponse(const std::string& mime_type,
                                   const std::string& headers,
                                   uint32 expected_length,
                                   uint32 last_modified,
                                   bool request_is_seekable);
   virtual void DidReceiveData(const char* buffer, int length, int data_offset);
   virtual void DidFinishLoading();
   virtual void DidFail();
   virtual bool IsMultiByteResponseExpected();
   virtual int ResourceId();
 
  private:
   GURL url_;
   unsigned long id_;
 
   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_