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

net/url_request/url_fetcher_core.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/url_request/url_fetcher_core.h"
 
 #include "base/bind.h"
 #include "base/file_util_proxy.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 928 matching lines @@
   OnReadCompleted(request_.get(), bytes_read);
 }
 
 void URLFetcherCore::DisownFile() {
   file_writer_->DisownFile();
 }
 
 void URLFetcherCore::InformDelegateUploadProgress() {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
   if (request_.get()) {
-    int64 current = request_->GetUploadProgress();
+    int64 current = request_->GetUploadProgress().position;
     if (current_upload_bytes_ != current) {
       current_upload_bytes_ = current;
       int64 total = -1;
       if (!is_chunked_upload_)
         total = static_cast<int64>(upload_content_.size());
       delegate_task_runner_->PostTask(
           FROM_HERE,
           base::Bind(
               &URLFetcherCore::InformDelegateUploadProgressInDelegateThread,
               this, current, total));
@@ skipping 38 matching lines @@
 }
 
 void URLFetcherCore::InformDelegateDownloadDataInDelegateThread(
     scoped_ptr<std::string> download_data) {
   DCHECK(delegate_task_runner_->BelongsToCurrentThread());
   if (delegate_)
     delegate_->OnURLFetchDownloadData(fetcher_, download_data.Pass());
 }
 
 }  // namespace net