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

net/url_request/url_request.cc

 // 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.
 
 #include "net/url_request/url_request.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/debug/stack_trace.h"
 #include "base/lazy_instance.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
 #include "base/stl_util.h"
 #include "base/synchronization/lock.h"
 #include "net/base/auth.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #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"
 #include "net/url_request/url_request_error_job.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_manager.h"
 #include "net/url_request/url_request_netlog_params.h"
 #include "net/url_request/url_request_redirect_job.h"
 
 using base::Time;
@@ skipping 226 matching lines @@
 
 void URLRequest::AppendChunkToUpload(const char* bytes,
                                      int bytes_len,
                                      bool is_last_chunk) {
   DCHECK(upload_data_stream_);
   DCHECK(upload_data_stream_->is_chunked());
   DCHECK_GT(bytes_len, 0);
   upload_data_stream_->AppendChunk(bytes, bytes_len, is_last_chunk);
 }
 
-void URLRequest::set_upload(UploadData* upload) {
+void URLRequest::set_upload(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_.reset(upload);
 }
 
 const UploadDataStream* URLRequest::get_upload() const {
   return upload_data_stream_.get();
 }
 
 bool URLRequest::has_upload() const {
   return upload_data_stream_.get() != NULL;
 }
 
@@ skipping 689 matching lines @@
       new base::debug::StackTrace(NULL, 0);
   *stack_trace_copy = stack_trace;
   stack_trace_.reset(stack_trace_copy);
 }
 
 const base::debug::StackTrace* URLRequest::stack_trace() const {
   return stack_trace_.get();
 }
 
 }  // namespace net