Implement upload progress handling in Mojo loading

content/browser/loader/mojo_async_resource_handler.cc

Index: content/browser/loader/mojo_async_resource_handler.cc
diff --git a/content/browser/loader/mojo_async_resource_handler.cc b/content/browser/loader/mojo_async_resource_handler.cc
index ea94fad16e296ce6330dcb4afeebdb518dd900e2..bbf20464e6399d6c26a69ea4d3455e4364a87513 100644
--- a/content/browser/loader/mojo_async_resource_handler.cc
+++ b/content/browser/loader/mojo_async_resource_handler.cc
@@ -4,10 +4,11 @@
 
 #include "content/browser/loader/mojo_async_resource_handler.h"
 
+#include <algorithm>

[yhirano, 2016/12/16 08:47:56]

Why is this needed?

[tzik, 2017/01/05 05:14:33]

This is for std::min().

 #include <utility>
 
+#include "base/bind.h"
 #include "base/command_line.h"
-#include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/macros.h"

[yhirano, 2016/12/16 08:47:56]

+base/memory/ptr_util.h

[tzik, 2017/01/05 05:14:33]

Done.

 #include "base/strings/string_number_conversions.h"
@@ -17,6 +18,7 @@
 #include "content/browser/loader/resource_controller.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_request_info_impl.h"
+#include "content/browser/loader/upload_progress_tracker.h"
 #include "content/common/resource_request_completion_status.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
@@ -25,7 +27,6 @@
 #include "mojo/public/cpp/bindings/message.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 #include "net/base/io_buffer.h"
-#include "net/base/load_flags.h"
 #include "net/base/mime_sniffer.h"
 #include "net/url_request/redirect_info.h"
 
@@ -156,8 +157,12 @@ bool MojoAsyncResourceHandler::OnRequestRedirected(
 
 bool MojoAsyncResourceHandler::OnResponseStarted(ResourceResponse* response,
                                                  bool* defer) {
-  const ResourceRequestInfoImpl* info = GetRequestInfo();
+  if (upload_progress_tracker_) {
+    upload_progress_tracker_->OnUploadCompleted();
+    upload_progress_tracker_ = nullptr;
+  }
 
+  const ResourceRequestInfoImpl* info = GetRequestInfo();
   if (rdh_->delegate()) {
     rdh_->delegate()->OnResponseStarted(request(), info->GetContext(),
                                         response);
@@ -183,6 +188,15 @@ bool MojoAsyncResourceHandler::OnResponseStarted(ResourceResponse* response,
 }
 
 bool MojoAsyncResourceHandler::OnWillStart(const GURL& url, bool* defer) {
+  if (GetRequestInfo()->is_upload_progress_enabled() &&
+      request()->has_upload()) {
+    upload_progress_tracker_ = base::MakeUnique<UploadProgressTracker>(
+        FROM_HERE,
+        base::BindRepeating(&MojoAsyncResourceHandler::SendUploadProgress,
+                            base::Unretained(this)),
+        request());
+  }
+
   return true;
 }
 
@@ -322,6 +336,11 @@ MojoResult MojoAsyncResourceHandler::EndWrite(uint32_t written) {
 void MojoAsyncResourceHandler::OnResponseCompleted(
     const net::URLRequestStatus& status,
     bool* defer) {
+  if (upload_progress_tracker_) {
+    upload_progress_tracker_->OnUploadCompleted();
+    upload_progress_tracker_ = nullptr;
+  }
+
   shared_writer_ = nullptr;
   buffer_ = nullptr;
   handle_watcher_.Cancel();
@@ -464,4 +483,17 @@ void MojoAsyncResourceHandler::OnTransfer(
   url_loader_client_ = std::move(url_loader_client);
 }
 
+void MojoAsyncResourceHandler::OnUploadProgressACK() {
+  if (upload_progress_tracker_)
+    upload_progress_tracker_->OnAckReceived();
+}
+
+void MojoAsyncResourceHandler::SendUploadProgress(int64_t current_position,
+                                                  int64_t total_size) {
+  url_loader_client_->OnUploadProgress(
+      current_position, total_size,
+      base::Bind(&MojoAsyncResourceHandler::OnUploadProgressACK,
+                 weak_factory_.GetWeakPtr()));
+}
+
 }  // namespace content