Implement transfer navigation with mojo

content/browser/loader/resource_loader.h

Index: content/browser/loader/resource_loader.h
diff --git a/content/browser/loader/resource_loader.h b/content/browser/loader/resource_loader.h
index 6ebcd2de50b08624c9cf4cb2eae356f015916135..6f6c3104be2c33279c0ee021e93697fea0a06cdc 100644
--- a/content/browser/loader/resource_loader.h
+++ b/content/browser/loader/resource_loader.h
@@ -14,6 +14,7 @@
 #include "content/browser/ssl/ssl_client_auth_handler.h"
 #include "content/browser/ssl/ssl_error_handler.h"
 #include "content/common/content_export.h"
+#include "content/common/url_loader.mojom.h"
 #include "content/public/browser/resource_controller.h"
 #include "net/url_request/url_request.h"
 
@@ -34,6 +35,10 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
                                       public SSLErrorHandler::Delegate,
                                       public SSLClientAuthHandler::Delegate,
                                       public ResourceController {
+  using TransferCallback =
+      base::Callback<void(mojom::URLLoaderAssociatedRequest,
+                          mojom::URLLoaderClientAssociatedPtr)>;
+
  public:
   ResourceLoader(std::unique_ptr<net::URLRequest> request,
                  std::unique_ptr<ResourceHandler> handler,
@@ -44,8 +49,10 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
   void CancelRequest(bool from_renderer);
 
   bool is_transferring() const { return is_transferring_; }
-  void MarkAsTransferring(const base::Closure& on_transfer_complete_callback);
-  void CompleteTransfer();
+  void MarkAsTransferring(
+      const TransferCallback& on_transfer_complete_callback);
+  void CompleteTransfer(mojom::URLLoaderAssociatedRequest,
+                        mojom::URLLoaderClientAssociatedPtr);
 
   net::URLRequest* request() { return request_.get(); }
   ResourceRequestInfoImpl* GetRequestInfo();
@@ -131,7 +138,7 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
   bool is_transferring_;
 
   // Called when a navigation has finished transfer.

[clamy, 2016/11/21 17:55:54]

Can you mention that this will update the NavigationThrottle? Now that we have
two TransferCallbacks, the code becomes less clear.

-  base::Closure on_transfer_complete_callback_;
+  TransferCallback on_transfer_complete_callback_;
 
   // Instrumentation add to investigate http://crbug.com/503306.
   // TODO(mmenke): Remove once bug is fixed.