Factor out upload progress handling from AsyncResourceHandler

content/browser/loader/async_resource_handler.h

 // 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.
 
 #ifndef CONTENT_BROWSER_LOADER_ASYNC_RESOURCE_HANDLER_H_
 #define CONTENT_BROWSER_LOADER_ASYNC_RESOURCE_HANDLER_H_
 
 #include <stdint.h>

[mmenke, 2016/12/13 18:29:46]

no longer needed, unless you follow my suggestion of making the callback an
AsyncResourceHandler method.

[tzik, 2016/12/14 06:50:30]

I did follow it, so now this is needed.

 
 #include <string>
 
 #include "base/macros.h"
 #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 "content/common/content_export.h"
 #include "net/base/io_buffer.h"
 #include "url/gurl.h"
 
 namespace net {
 class URLRequest;
 }
 
 namespace content {
 class ResourceBuffer;
 class ResourceDispatcherHostImpl;
+class UploadProgressTracker;
 
 // Used to complete an asynchronous resource request in response to resource
 // load events from the resource dispatcher host.
 class CONTENT_EXPORT AsyncResourceHandler : public ResourceHandler,
                                             public ResourceMessageDelegate {
  public:
   AsyncResourceHandler(net::URLRequest* request,
                        ResourceDispatcherHostImpl* rdh);
   ~AsyncResourceHandler() override;
 
@@ skipping 14 matching lines @@
   void OnDataDownloaded(int bytes_downloaded) override;
 
  private:
   class InliningHelper;
 
   // IPC message handlers:
   void OnFollowRedirect(int request_id);
   void OnDataReceivedACK(int request_id);
   void OnUploadProgressACK(int request_id);
 
-  void ReportUploadProgress();
-
   bool EnsureResourceBufferIsInitialized();
   void ResumeIfDeferred();
   void OnDefer();
   bool CheckForSufficientResource();
   int CalculateEncodedDataLengthToReport();
   int CalculateEncodedBodyLengthToReport();
   void RecordHistogram();
 
   scoped_refptr<ResourceBuffer> buffer_;
   ResourceDispatcherHostImpl* rdh_;
 
   // Number of messages we've sent to the renderer that we haven't gotten an
   // ACK for. This allows us to avoid having too many messages in flight.
   int pending_data_count_;
 
   int allocation_size_;
 
   bool first_chunk_read_ = false;
 
   bool did_defer_;
 
   bool has_checked_for_sufficient_resources_;
   bool sent_received_response_msg_;
   bool sent_data_buffer_msg_;
 
   std::unique_ptr<InliningHelper> inlining_helper_;
   base::TimeTicks response_started_ticks_;
 
-  uint64_t last_upload_position_;
-  bool waiting_for_upload_progress_ack_;
-  base::TimeTicks last_upload_ticks_;
-  base::RepeatingTimer progress_timer_;
+  std::unique_ptr<UploadProgressTracker> upload_progress_tracker_;

[mmenke, 2016/12/13 18:29:46]

include <memory>

[tzik, 2016/12/14 06:50:30]

Done.

 
   int64_t reported_transfer_size_;
 
   DISALLOW_COPY_AND_ASSIGN(AsyncResourceHandler);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_ASYNC_RESOURCE_HANDLER_H_