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

net/url_request/url_request.h

 // Copyright (c) 2012 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 NET_URL_REQUEST_URL_REQUEST_H_
 #define NET_URL_REQUEST_URL_REQUEST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 73 matching lines @@
 class BlobURLRequestJobTest;
 }
 
 namespace net {
 
 class CookieOptions;
 class HostPortPair;
 class IOBuffer;
 class SSLCertRequestInfo;
 class SSLInfo;
-class UploadData;
 class UploadDataStream;
 class URLRequestContext;
 class URLRequestJob;
 class X509Certificate;
 
 // This stores the values of the Set-Cookie headers received during the request.
 // Each item in the vector corresponds to a Set-Cookie: line received,
 // excluding the "Set-Cookie:" part.
 typedef std::vector<std::string> ResponseCookies;
 
@@ skipping 300 matching lines @@
 
   // Appends the given bytes to the request's upload data to be sent
   // immediately via chunked transfer encoding. When all data has been sent,
   // call MarkEndOfChunks() to indicate the end of upload data.
   //
   // This method may be called only after calling EnableChunkedUpload().
   void AppendChunkToUpload(const char* bytes,
                            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.
   bool has_upload() const;
 
   // Set an extra request header by ID or name, or remove one by name.  These
   // methods may only be called before Start() is called, or before a new
   // redirect in the request chain.
   void SetExtraRequestHeaderById(int header_id, const std::string& value,
                                  bool overwrite);
@@ skipping 320 matching lines @@
   // most of the dependencies which are shared between requests (disk cache,
   // cookie store, socket pool, etc.)
   const URLRequestContext* context_;
 
   NetworkDelegate* network_delegate_;
 
   // Tracks the time spent in various load states throughout this request.
   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_;
   GURL delegate_redirect_url_;
   std::string method_;  // "GET", "POST", etc. Should be all uppercase.
   std::string referrer_;
   ReferrerPolicy referrer_policy_;
   HttpRequestHeaders extra_request_headers_;
   int load_flags_;  // Flags indicating the request type for the load;
                     // expected values are LOAD_* enums above.
@@ skipping 72 matching lines @@
   base::TimeTicks creation_time_;
 
   scoped_ptr<const base::debug::StackTrace> stack_trace_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequest);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_H_