net: Remove UploadElement::TYPE_CHUNK

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/file_util.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 #include "net/base/file_stream.h"
@@ skipping 63 matching lines @@
       *upload_data_->elements_mutable();
 
   int bytes_copied = 0;
   while (bytes_copied < buf_len && element_index_ < elements.size()) {
     UploadElement& element = elements[element_index_];
 
     bytes_copied += element.ReadSync(buf->data() + bytes_copied,
                                      buf_len - bytes_copied);
 
     if (element.BytesRemaining() == 0)
-        ++element_index_;
+      ++element_index_;
 
     if (is_chunked() && !merge_chunks_)
       break;
   }
 
   current_position_ += bytes_copied;
   if (is_chunked() && !IsEOF() && bytes_copied == 0)
     return ERR_IO_PENDING;
 
   return bytes_copied;
 }
 
 bool UploadDataStream::IsEOF() const {
   const std::vector<UploadElement>& elements = *upload_data_->elements();
 
   // Check if all elements are consumed.
   if (element_index_ == elements.size()) {
-    // If the upload data is chunked, check if the last element is the
-    // last chunk.
-    if (!upload_data_->is_chunked() ||
-        (!elements.empty() && elements.back().is_last_chunk())) {
+    // If the upload data is chunked, check if the last chunk is appended.
+    if (!upload_data_->is_chunked() || upload_data_->last_chunk_appended())
       return true;
-    }
   }
   return false;
 }
 
 bool UploadDataStream::IsInMemory() const {
   DCHECK(initialized_successfully_);
 
   return upload_data_->IsInMemory();
 }
 
 }  // namespace net