Merge CrossSiteResourceHandler and NavigationResourceThrottle

content/browser/loader/resource_loader.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_RESOURCE_LOADER_H_
 #define CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 34 matching lines @@
   ResourceLoader(std::unique_ptr<net::URLRequest> request,
                  std::unique_ptr<ResourceHandler> handler,
                  CertStore* cert_store,
                  ResourceLoaderDelegate* delegate);
   ~ResourceLoader() override;
 
   void StartRequest();
   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(); }
   ResourceRequestInfoImpl* GetRequestInfo();
 
   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:
   void OnReceivedRedirect(net::URLRequest* request,
                           const net::RedirectInfo& redirect_info,
                           bool* defer) override;
   void OnAuthRequired(net::URLRequest* request,
                       net::AuthChallengeInfo* info) override;
   void OnCertificateRequested(net::URLRequest* request,
                               net::SSLCertRequestInfo* info) override;
@@ skipping 60 matching lines @@
   scoped_refptr<ResourceDispatcherHostLoginDelegate> login_delegate_;
   std::unique_ptr<SSLClientAuthHandler> ssl_client_auth_handler_;
 
   base::TimeTicks read_deferral_start_time_;
 
   // Indicates that we are in a state of being transferred to a new downstream
   // consumer.  We are waiting for a notification to complete the transfer, at
   // 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.
   int times_cancelled_before_request_start_;
   bool started_request_;
   int times_cancelled_after_request_start_;
 
   // Allows tests to use a mock CertStore. The CertStore must outlive
   // the ResourceLoader.
   CertStore* cert_store_;
 
   base::WeakPtrFactory<ResourceLoader> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceLoader);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_