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 48 matching lines @@
   type_ = TYPE_CHUNK;
   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;
 
   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 141 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