net: Change argument of URLRequest::set_upload from UploadData to UploadDataStream

net/url_request/url_request.h

Index: net/url_request/url_request.h
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index b4a44c6b6f05bd2fb01991ad948c7786d40f323e..84b64d1f6641e491b62561d5386da77c96f80c11 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -91,7 +91,6 @@ class HostPortPair;
 class IOBuffer;
 class SSLCertRequestInfo;
 class SSLInfo;
-class UploadData;
 class UploadDataStream;
 class URLRequestContext;
 class URLRequestJob;
@@ -412,10 +411,10 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
                            int bytes_len,
                            bool is_last_chunk);
 
-  // Set the upload data directly.
-  void set_upload(UploadData* upload);
+  // Sets the upload data. This method takes the ownership of the argument.
+  void set_upload(UploadDataStream* upload);

[kinuko, 2012/12/12 01:19:17]

Could this take scoped_ptr<UploadDataStream> to make the ownership relationship
more explicit?

[hashimoto, 2012/12/12 10:29:07]

Done.

 
-  // Get the upload data directly.
+  // Gets the upload data.
   const UploadDataStream* get_upload() const;
 
   // Returns true if the request has a non-empty message body to upload.
@@ -756,7 +755,6 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
   BoundNetLog net_log_;
 
   scoped_refptr<URLRequestJob> job_;
-  scoped_refptr<UploadData> upload_;
   scoped_ptr<UploadDataStream> upload_data_stream_;
   std::vector<GURL> url_chain_;
   GURL first_party_for_cookies_;