Split net::UploadData into two: for IPC and for upload handling

net/base/upload_data.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.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 13 matching lines @@
 void OnGetContentLengthComplete(
     const UploadData::ContentLengthCallback& callback,
     uint64* content_length) {
   callback.Run(*content_length);
 }
 
 }  // namespace
 
 UploadData::Element::Element()
     : type_(TYPE_BYTES),
+      bytes_start_(NULL),
+      bytes_length_(0),
       file_range_offset_(0),
       file_range_length_(kuint64max),
       is_last_chunk_(false),
       override_content_length_(false),
       content_length_computed_(false),
       content_length_(-1),
       offset_(0),
       file_stream_(NULL) {
 }
 
 UploadData::Element::~Element() {
   // In the common case |file__stream_| will be null.
   if (file_stream_) {
     // Temporarily allow until fix: http://crbug.com/72001.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     file_stream_->CloseSync();
     delete file_stream_;
   }
 }
 
 void UploadData::Element::SetToChunk(const char* bytes,
                                      int bytes_len,
                                      bool is_last_chunk) {
-  bytes_.clear();
-  bytes_.insert(bytes_.end(), bytes, bytes + bytes_len);
   type_ = TYPE_CHUNK;
+  buf_.assign(bytes, bytes + bytes_len);
   is_last_chunk_ = is_last_chunk;
 }
 
 uint64 UploadData::Element::GetContentLength() {
   if (override_content_length_ || content_length_computed_)
     return content_length_;
 
   if (type_ == TYPE_BYTES || type_ == TYPE_CHUNK)
-    return static_cast<uint64>(bytes_.size());
-  else if (type_ == TYPE_BLOB)
-    // The blob reference will be resolved later.
-    return 0;
+    return bytes_length();
 
   DCHECK_EQ(TYPE_FILE, type_);
   DCHECK(!file_stream_);
 
   // TODO(darin): This size calculation could be out of sync with the state of
   // the file when we get around to reading it.  We should probably find a way
   // to lock the file or somehow protect against this error condition.
 
   content_length_computed_ = true;
   content_length_ = 0;
@@ skipping 73 matching lines @@
 int UploadData::Element::ReadFromMemorySync(char* buf, int buf_len) {
   DCHECK_LT(0, buf_len);
   DCHECK(type_ == UploadData::TYPE_BYTES || type_ == UploadData::TYPE_CHUNK);
 
   const size_t num_bytes_to_read = std::min(BytesRemaining(),
                                             static_cast<uint64>(buf_len));
 
   // Check if we have anything to copy first, because we are getting
   // the address of an element in |bytes_| and that will throw an
   // exception if |bytes_| is an empty vector.
-  if (num_bytes_to_read > 0) {
-    memcpy(buf, &bytes_[offset_], num_bytes_to_read);
-  }
+  if (num_bytes_to_read > 0)
+    memcpy(buf, bytes() + offset_, num_bytes_to_read);
 
   offset_ += num_bytes_to_read;
   return num_bytes_to_read;
 }
 
 int UploadData::Element::ReadFromFileSync(char* buf, int buf_len) {
   DCHECK_LT(0, buf_len);
   DCHECK_EQ(UploadData::TYPE_FILE, type_);
 
   // Open the file of the current element if not yet opened.
@@ skipping 45 matching lines @@
 
 void UploadData::AppendFileRange(const FilePath& file_path,
                                  uint64 offset, uint64 length,
                                  const base::Time& expected_modification_time) {
   DCHECK(!is_chunked_);
   elements_.push_back(Element());
   elements_.back().SetToFilePathRange(file_path, offset, length,
                                       expected_modification_time);
 }
 
-void UploadData::AppendBlob(const GURL& blob_url) {
-  DCHECK(!is_chunked_);
-  elements_.push_back(Element());
-  elements_.back().SetToBlobUrl(blob_url);
-}
-
 void UploadData::AppendChunk(const char* bytes,
                              int bytes_len,
                              bool is_last_chunk) {
   DCHECK(is_chunked_);
   elements_.push_back(Element());
   elements_.back().SetToChunk(bytes, bytes_len, is_last_chunk);
   if (chunk_callback_)
     chunk_callback_->OnChunkAvailable();
 }
 
@@ skipping 50 matching lines @@
     return;
 
   for (size_t i = 0; i < elements_.size(); ++i)
     *content_length += elements_[i].GetContentLength();
 }
 
 UploadData::~UploadData() {
 }
 
 }  // namespace net