| 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..3b0eadaaf1f6149917ea64e461ea211dd676ded6 100644
|
| --- a/content/browser/loader/resource_loader.h
|
| +++ b/content/browser/loader/resource_loader.h
|
| @@ -39,12 +39,10 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
|
| static void GetSSLStatusForRequest(const GURL& url,
|
| const net::SSLInfo& ssl_info,
|
| int child_id,
|
| - CertStore* cert_store,
|
| SSLStatus* ssl_status);
|
|
|
| ResourceLoader(std::unique_ptr<net::URLRequest> request,
|
| std::unique_ptr<ResourceHandler> handler,
|
| - CertStore* cert_store,
|
| ResourceLoaderDelegate* delegate);
|
| ~ResourceLoader() override;
|
|
|
| @@ -60,15 +58,6 @@ 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();
|
| - }
|
| -
|
| private:
|
| // net::URLRequest::Delegate implementation:
|
| void OnReceivedRedirect(net::URLRequest* request,
|
| @@ -148,22 +137,12 @@ 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_;
|
| -
|
| // 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);
|
|
|