net: Move the logic reading upload elements to UploadData::Element.

net/base/upload_data_stream.h

Index: net/base/upload_data_stream.h
diff --git a/net/base/upload_data_stream.h b/net/base/upload_data_stream.h
index ad70b098b4aeac982ee7247ebc7e69f64acb4ddf..65d42368d39fb2bc4e8ed64231b8c06b1d41546d 100644
--- a/net/base/upload_data_stream.h
+++ b/net/base/upload_data_stream.h
@@ -69,9 +69,6 @@ class NET_EXPORT UploadDataStream {
   static void set_merge_chunks(bool merge) { merge_chunks_ = merge; }
 
  private:
-  // Advances to the next element. Updates the internal states.
-  void AdvanceToNextElement();
-
   scoped_refptr<UploadData> upload_data_;
 
   // Index of the current upload element (i.e. the element currently being
@@ -79,18 +76,6 @@ class NET_EXPORT UploadDataStream {
   // |upload_data_|.
   size_t element_index_;
 
-  // The byte offset into the current element's data buffer if the current
-  // element is a TYPE_BYTES or TYPE_DATA element.
-  size_t element_offset_;
-
-  // A stream to the currently open file, for the current element if the
-  // current element is a TYPE_FILE element.
-  scoped_ptr<FileStream> element_file_stream_;
-
-  // The number of bytes remaining to be read from the currently open file
-  // if the current element is of TYPE_FILE.
-  uint64 element_file_bytes_remaining_;
-
   // Size and current read position within the upload data stream.
   uint64 total_size_;
   uint64 current_position_;