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

chrome/browser/automation/url_request_automation_job.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 "chrome/browser/automation/url_request_automation_job.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/time.h"
@@ skipping 211 matching lines @@
 bool URLRequestAutomationJob::IsRedirectResponse(
     GURL* location, int* http_status_code) {
   if (!net::HttpResponseHeaders::IsRedirectResponseCode(redirect_status_))
     return false;
 
   *http_status_code = redirect_status_;
   *location = GURL(redirect_url_);
   return true;
 }
 
-uint64 URLRequestAutomationJob::GetUploadProgress() const {
-  if (request_ && request_->status().is_success()) {
+net::UploadProgress URLRequestAutomationJob::GetUploadProgress() const {
+  if (!request_)
+    return net::UploadProgress();
+
+  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);
+  if (!info)
+    return net::UploadProgress();
+
+  const uint64 size = info->GetUploadSize();
+  if (request_->status().is_success()) {
     // We don't support incremental progress notifications in ChromeFrame. When
     // we receive a response for the POST request from Chromeframe, it means
     // that the upload is fully complete.
-    const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);
-    if (info) {
-      return info->GetUploadSize();
-    }
+    return net::UploadProgress(size, size);
   }
-  return 0;
+  return net::UploadProgress(0, size);
 }
 
 net::HostPortPair URLRequestAutomationJob::GetSocketAddress() const {
   return socket_address_;
 }
 
 bool URLRequestAutomationJob::MayFilterMessage(const IPC::Message& message,
                                                int* request_id) {
   switch (message.type()) {
     case AutomationMsg_RequestStarted::ID:
@@ skipping 232 matching lines @@
   if (!is_done()) {
     NotifyDone(request_status_);
   }
   // Reset any pending reads.
   if (pending_buf_) {
     pending_buf_ = NULL;
     pending_buf_size_ = 0;
     NotifyReadComplete(0);
   }
 }