net: Return size of upload as well as position from HttpTransaction::GetUploadProgress()

net/http/http_stream_parser.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/http/http_stream_parser.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
@@ skipping 859 matching lines @@
     if (response_->headers->IsChunkEncoded()) {
       chunked_decoder_.reset(new HttpChunkedDecoder());
     } else {
       response_body_length_ = response_->headers->GetContentLength();
       // If response_body_length_ is still -1, then we have to wait
       // for the server to close the connection.
     }
   }
 }
 
-uint64 HttpStreamParser::GetUploadProgress() const {
+UploadProgress HttpStreamParser::GetUploadProgress() const {
   if (!request_body_.get())
-    return 0;
+    return UploadProgress();
 
-  return request_body_->position();
+  return UploadProgress(request_body_->position(), request_body_->size());
 }
 
 HttpResponseInfo* HttpStreamParser::GetResponseInfo() {
   return response_;
 }
 
 bool HttpStreamParser::IsResponseBodyComplete() const {
   if (chunked_decoder_.get())
     return chunked_decoder_->reached_eof();
   if (response_body_length_ != -1)
@@ skipping 74 matching lines @@
       request_body->IsInMemory() &&
       request_body->size() > 0) {
     size_t merged_size = request_headers.size() + request_body->size();
     if (merged_size <= kMaxMergedHeaderAndBodySize)
       return true;
   }
   return false;
 }
 
 }  // namespace net