Implement upload progress handling in Mojo loading

content/browser/loader/mojo_async_resource_handler.h

 // Copyright 2016 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_MOJO_ASYNC_RESOURCE_HANDLER_H_
 #define CONTENT_BROWSER_LOADER_MOJO_ASYNC_RESOURCE_HANDLER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "base/timer/timer.h"
 #include "content/browser/loader/resource_handler.h"
+#include "content/browser/loader/upload_progress_tracker.h"
 #include "content/common/content_export.h"
 #include "content/common/url_loader.mojom.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 #include "mojo/public/cpp/system/watcher.h"
 #include "net/base/io_buffer.h"
-#include "url/gurl.h"
+
+class GURL;
 
 namespace net {
 class IOBufferWithSize;
 class URLRequest;
 }
 
 namespace content {
 class ResourceDispatcherHostImpl;
 struct ResourceResponse;
 
@@ skipping 23 matching lines @@
   bool OnResponseStarted(ResourceResponse* response, bool* defer) override;
   bool OnWillStart(const GURL& url, bool* defer) override;
   bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                   int* buf_size,
                   int min_size) override;
   bool OnReadCompleted(int bytes_read, bool* defer) override;
   void OnResponseCompleted(const net::URLRequestStatus& status,
                            bool* defer) override;
   void OnDataDownloaded(int bytes_downloaded) override;
 
-  // mojom::URLLoader implementation
+  // mojom::URLLoader implementation:
   void FollowRedirect() override;
 
   void OnWritableForTesting();
   static void SetAllocationSizeForTesting(size_t size);
   static constexpr size_t kDefaultAllocationSize = 512 * 1024;
 
  protected:
   // These functions can be overriden only for tests.
   virtual MojoResult BeginWrite(void** data, uint32_t* available);
   virtual MojoResult EndWrite(uint32_t written);
@@ skipping 12 matching lines @@
   bool AllocateWriterIOBuffer(scoped_refptr<net::IOBufferWithSize>* buf,
                               bool* defer);
 
   bool CheckForSufficientResource();
   void OnWritable(MojoResult result);
   void Cancel();
   // Calculates the diff between URLRequest::GetTotalReceivedBytes() and
   // |reported_total_received_bytes_|, returns it, and updates
   // |reported_total_received_bytes_|.
   int64_t CalculateRecentlyReceivedBytes();
-  // This function can be overriden only for tests.
+
+  // These function can be overriden only for tests.
   virtual void ReportBadMessage(const std::string& error);
+  virtual std::unique_ptr<UploadProgressTracker> CreateUploadProgressTracker(
+      const tracked_objects::Location& from_here,

[mmenke, 2017/01/19 16:06:49]

Should forward declare tracked_objects::Location

[tzik, 2017/01/20 04:42:03]

Done.

+      UploadProgressTracker::UploadProgressReportCallback callback);
 
   void OnTransfer(mojom::URLLoaderAssociatedRequest mojo_request,
                   mojom::URLLoaderClientAssociatedPtr url_loader_client);
+  void SendUploadProgress(const net::UploadProgress& progress);
+  void OnUploadProgressACK();
 
   ResourceDispatcherHostImpl* rdh_;
   mojo::AssociatedBinding<mojom::URLLoader> binding_;
 
   bool has_checked_for_sufficient_resources_ = false;
   bool sent_received_response_message_ = false;
   bool is_using_io_buffer_not_from_writer_ = false;
   bool did_defer_on_writing_ = false;
   bool did_defer_on_redirect_ = false;
   base::TimeTicks response_started_ticks_;
   int64_t reported_total_received_bytes_ = 0;
 
   mojo::Watcher handle_watcher_;
   std::unique_ptr<mojom::URLLoader> url_loader_;
   mojom::URLLoaderClientAssociatedPtr url_loader_client_;
   scoped_refptr<net::IOBufferWithSize> buffer_;
   size_t buffer_offset_ = 0;
   size_t buffer_bytes_read_ = 0;
   scoped_refptr<SharedWriter> shared_writer_;
   mojo::ScopedDataPipeConsumerHandle response_body_consumer_handle_;
 
+  std::unique_ptr<UploadProgressTracker> upload_progress_tracker_;
+
   base::WeakPtrFactory<MojoAsyncResourceHandler> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(MojoAsyncResourceHandler);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_MOJO_ASYNC_RESOURCE_HANDLER_H_