Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / child / npapi / plugin_url_fetcher.h

diff --git a/src/content/child/npapi/plugin_url_fetcher.h b/src/content/child/npapi/plugin_url_fetcher.h
index 7eab78e..8dc53f2 100644 (file)
--- a/src/content/child/npapi/plugin_url_fetcher.h
+++ b/src/content/child/npapi/plugin_url_fetcher.h
@@ -12,11 +12,11 @@
 #include "url/gurl.h"
 
 namespace webkit_glue {
-class MultipartResponseDelegate;
 class ResourceLoaderBridge;
 }
 
 namespace content {
+class MultipartResponseDelegate;
 class PluginStreamUrl;
 
 // Fetches URLS for a plugin using ResourceDispatcher.
@@ -56,8 +56,7 @@ class PluginURLFetcher : public RequestPeer {
  private:
   // RequestPeer implementation:
   virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
-  virtual bool OnReceivedRedirect(const GURL& new_url,
-                                  const GURL& new_first_party_for_cookies,
+  virtual bool OnReceivedRedirect(const net::RedirectInfo& redirect_info,
                                   const ResourceResponseInfo& info) OVERRIDE;
   virtual void OnReceivedResponse(const ResourceResponseInfo& info) OVERRIDE;
   virtual void OnDownloadedData(int len, int encoded_data_length) OVERRIDE;
@@ -76,7 +75,6 @@ class PluginURLFetcher : public RequestPeer {
   PluginStreamUrl* plugin_stream_;
   GURL url_;
   GURL first_party_for_cookies_;
-  std::string method_;
   GURL referrer_;
   bool notify_redirects_;
   bool is_plugin_src_load_;
@@ -88,7 +86,7 @@ class PluginURLFetcher : public RequestPeer {
   int64 data_offset_;
   bool pending_failure_notification_;
 
-  scoped_ptr<webkit_glue::MultipartResponseDelegate> multipart_delegate_;
+  scoped_ptr<MultipartResponseDelegate> multipart_delegate_;
 
   scoped_ptr<webkit_glue::ResourceLoaderBridge> bridge_;