moved upload progress logic from ResourceLoader to AsyncResourceHandler

content/browser/loader/async_resource_handler.h

Index: content/browser/loader/async_resource_handler.h
diff --git a/content/browser/loader/async_resource_handler.h b/content/browser/loader/async_resource_handler.h
index fb4086db4eecf17f6ffa52f26f972dcd0b262bb3..e75414b3daa5fe7e151ca4922e92f90cc77eccfc 100644
--- a/content/browser/loader/async_resource_handler.h
+++ b/content/browser/loader/async_resource_handler.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/memory/ref_counted.h"
+#include "base/timer/timer.h"
 #include "content/browser/loader/resource_handler.h"
 #include "content/browser/loader/resource_message_delegate.h"
 #include "url/gurl.h"
@@ -34,8 +35,10 @@ class AsyncResourceHandler : public ResourceHandler,
 
   bool OnMessageReceived(const IPC::Message& message) override;
 
+  void ReportUploadProgress();

[mmenke, 2015/08/26 19:13:12]

This should be private.

+
   // ResourceHandler implementation:
-  bool OnUploadProgress(uint64 position, uint64 size) override;
+  bool OnUploadProgress(uint64 position, uint64 size);

[mmenke, 2015/08/26 19:13:12]

This is no longer part of the ResourceHandler, and should be private.  Or
better, let's just inline it in ReportUploadProgress.

   bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
                            ResourceResponse* response,
                            bool* defer) override;
@@ -54,6 +57,7 @@ class AsyncResourceHandler : public ResourceHandler,
  private:
   // IPC message handlers:
   void OnFollowRedirect(int request_id);
+  void OnUploadProgressACK(int request_id);
   void OnDataReceivedACK(int request_id);
 
   bool EnsureResourceBufferIsInitialized();
@@ -75,6 +79,11 @@ class AsyncResourceHandler : public ResourceHandler,
   bool sent_received_response_msg_;
   bool sent_first_data_msg_;
 
+  uint64 last_upload_position_;
+  bool waiting_for_upload_progress_ack_;
+  base::TimeTicks last_upload_ticks_;
+  base::RepeatingTimer<AsyncResourceHandler> progress_timer_;
+
   int64_t reported_transfer_size_;
 
   DISALLOW_COPY_AND_ASSIGN(AsyncResourceHandler);