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

net/url_request/url_request.cc

Index: net/url_request/url_request.cc
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index 8831ec69a1f960aff491c478e1625cc18de571f8..735a34de1ad869a55bb983db1651acbf3c3c48dc 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -23,10 +23,7 @@
 #include "net/base/network_change_notifier.h"
 #include "net/base/network_delegate.h"
 #include "net/base/ssl_cert_request_info.h"
-#include "net/base/upload_bytes_element_reader.h"
-#include "net/base/upload_data.h"
 #include "net/base/upload_data_stream.h"
-#include "net/base/upload_file_element_reader.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request_context.h"
@@ -273,33 +270,9 @@ void URLRequest::AppendChunkToUpload(const char* bytes,
   upload_data_stream_->AppendChunk(bytes, bytes_len, is_last_chunk);
 }
 
-void URLRequest::set_upload(UploadData* upload) {
+void URLRequest::set_upload(scoped_ptr<UploadDataStream> upload) {
   DCHECK(!upload->is_chunked());
-  upload_ = upload;
-  ScopedVector<UploadElementReader> element_readers;
-  const ScopedVector<UploadElement>& elements = upload->elements();
-  for (ScopedVector<UploadElement>::const_iterator it = elements.begin();
-       it != elements.end(); ++it) {
-    UploadElementReader* reader = NULL;
-    const UploadElement& element = **it;
-    switch (element.type()) {
-      case UploadElement::TYPE_BYTES:
-        reader = new UploadBytesElementReader(element.bytes(),
-                                              element.bytes_length());
-        break;
-      case UploadElement::TYPE_FILE:
-        reader = new UploadFileElementReader(
-            element.file_path(),
-            element.file_range_offset(),
-            element.file_range_length(),
-            element.expected_file_modification_time());
-        break;
-    }
-    DCHECK(reader);
-    element_readers.push_back(reader);
-  }
-  upload_data_stream_.reset(new UploadDataStream(&element_readers,
-                                                 upload->identifier()));
+  upload_data_stream_ = upload.Pass();
 }
 
 const UploadDataStream* URLRequest::get_upload() const {