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

net/base/upload_data_stream.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/base/upload_data_stream.h"
 
 #include "base/logging.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/base/upload_element_reader.h"
 
 namespace net {
 
-namespace {
-
-// A subclass of UplodBytesElementReader which owns the data given as a vector.
-class UploadOwnedBytesElementReader : public UploadBytesElementReader {
- public:
-  UploadOwnedBytesElementReader(std::vector<char>* data)
-      : UploadBytesElementReader(&(*data)[0], data->size()) {
-    data_.swap(*data);
-  }
-
-  virtual ~UploadOwnedBytesElementReader() {}
-
- private:
-  std::vector<char> data_;
-};
-
-}  // namespace
-
 bool UploadDataStream::merge_chunks_ = true;
 
 // static
 void UploadDataStream::ResetMergeChunks() {
   // WARNING: merge_chunks_ must match the above initializer.
   merge_chunks_ = true;
 }
 
 UploadDataStream::UploadDataStream(
     ScopedVector<UploadElementReader>* element_readers,
@@ skipping 16 matching lines @@
       identifier_(identifier),
       is_chunked_(true),
       last_chunk_appended_(false),
       initialized_successfully_(false),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
 UploadDataStream::~UploadDataStream() {
 }
 
+UploadDataStream* UploadDataStream::CreateWithReader(
+    scoped_ptr<UploadElementReader> reader,
+    int64 identifier) {
+  ScopedVector<UploadElementReader> readers;
+  readers.push_back(reader.release());
+  return new UploadDataStream(&readers, identifier);
+}
+
 int UploadDataStream::Init(const CompletionCallback& callback) {
   Reset();
   // Use fast path when initialization can be done synchronously.
   if (IsInMemory())
     return InitSync();
 
   return InitInternal(0, callback);
 }
 
 int UploadDataStream::InitSync() {
@@ skipping 202 matching lines @@
   // Add the last result.
   buf->DidConsume(previous_result);
 
   DCHECK(!callback.is_null());
   const int result = ReadInternal(buf, callback);
   if (result != ERR_IO_PENDING)
     callback.Run(result);
 }
 
 }  // namespace net