Merge CrossSiteResourceHandler and NavigationResourceThrottle

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 6cbb2b3466ea7c6bdb87555a816214b23de78f09..05c445a48bb7b103220145b2c3a119e26801865e 100644
--- a/content/browser/loader/resource_loader.h
+++ b/content/browser/loader/resource_loader.h
@@ -52,7 +52,7 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
   void CancelRequest(bool from_renderer);
 
   bool is_transferring() const { return is_transferring_; }
-  void MarkAsTransferring(const scoped_refptr<ResourceResponse>& response);
+  void MarkAsTransferring(const base::Closure& on_transfer_complete_callback);
   void CompleteTransfer();
 
   net::URLRequest* request() { return request_.get(); }
@@ -60,14 +60,8 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
 
   void ClearLoginDelegate();
 
-  // Returns a pointer to the ResourceResponse for a request that is
-  // being transferred to a new consumer. The response is valid between
-  // the time that the request is marked as transferring via
-  // MarkAsTransferring() and the time that the transfer is completed
-  // via CompleteTransfer().
-  ResourceResponse* transferring_response() {
-    return transferring_response_.get();
-  }
+  // Returns a pointer to the ResourceResponse for the request.
+  ResourceResponse* response() { return response_.get(); }
 
  private:
   // net::URLRequest::Delegate implementation:
@@ -148,11 +142,10 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
   // which point we'll receive a new ResourceHandler.
   bool is_transferring_;
 
-  // Holds the ResourceResponse for a request that is being transferred
-  // to a new consumer. This member is populated when the request is
-  // marked as transferring via MarkAsTransferring(), and it is cleared
-  // when the transfer is completed via CompleteTransfer().
-  scoped_refptr<ResourceResponse> transferring_response_;
+  scoped_refptr<ResourceResponse> response_;

[nasko, 2016/09/08 23:45:39]

Can we have a comment on this member? Especially since before it was kept only
for short period of time and now it looks like it is bound to the lifetime of
this object.

[clamy, 2016/09/09 15:06:41]

This object is no longer there since jam's patch removed cert store (we only
kept it to update the certificate).

[nasko, 2016/09/09 23:30:27]

Acknowledged.

+
+  // Called when a navigation has finished transfer.
+  base::Closure on_transfer_complete_;
 
   // Instrumentation add to investigate http://crbug.com/503306.
   // TODO(mmenke): Remove once bug is fixed.