net: Remove UploadElement::TYPE_CHUNK

net/base/upload_element.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_element.h"
 
 #include <algorithm>
 
 #include "base/file_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
 
 namespace net {
 
 UploadElement::UploadElement()
     : 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) {
 }
 
 UploadElement::~UploadElement() {
   // 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 UploadElement::SetToChunk(const char* bytes,
-                               int bytes_len,
-                               bool is_last_chunk) {
-  type_ = TYPE_CHUNK;
-  buf_.assign(bytes, bytes + bytes_len);
-  is_last_chunk_ = is_last_chunk;
-}
-
 uint64 UploadElement::GetContentLength() {
   if (override_content_length_ || content_length_computed_)
     return content_length_;
 
-  if (type_ == TYPE_BYTES || type_ == TYPE_CHUNK)
+  if (type_ == TYPE_BYTES)
     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;
@@ skipping 12 matching lines @@
 
   if (file_range_offset_ >= static_cast<uint64>(length))
     return 0;  // range is beyond eof
 
   // compensate for the offset and clip file_range_length_ to eof
   content_length_ =  std::min(length - file_range_offset_, file_range_length_);
   return content_length_;
 }
 
 int UploadElement::ReadSync(char* buf, int buf_len) {
-  if (type_ == TYPE_BYTES || type_ == TYPE_CHUNK) {
+  if (type_ == TYPE_BYTES) {
     return ReadFromMemorySync(buf, buf_len);
   } else if (type_ == TYPE_FILE) {
     return ReadFromFileSync(buf, buf_len);
   }
 
   NOTREACHED();
   return 0;
 }
 
 uint64 UploadElement::BytesRemaining() {
@@ skipping 33 matching lines @@
                     << ")";
       return NULL;
     }
   }
 
   return file.release();
 }
 
 int UploadElement::ReadFromMemorySync(char* buf, int buf_len) {
   DCHECK_LT(0, buf_len);
-  DCHECK(type_ == TYPE_BYTES || type_ == TYPE_CHUNK);
+  DCHECK(type_ == TYPE_BYTES);
 
   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);
 
@@ skipping 32 matching lines @@
       // rest of the data.
       memset(buf, 0, num_bytes_to_read);
     }
   }
 
   offset_ += num_bytes_to_read;
   return num_bytes_to_read;
 }
 
 }  // namespace net