| Index: content/browser/loader/resource_loader.h
|
| diff --git a/content/browser/loader/resource_loader.h b/content/browser/loader/resource_loader.h
|
| index 976111a7408f595d7fee3eb19187a6c3d202493b..a9d826a84fd14759fe5ffd94232649b93f159a4f 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 "content/public/common/signed_certificate_timestamp_id_and_status.h"
|
| #include "net/url_request/url_request.h"
|
| @@ -39,6 +40,12 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
|
| ResourceLoader(std::unique_ptr<net::URLRequest> request,
|
| std::unique_ptr<ResourceHandler> handler,
|
| CertStore* cert_store,
|
| + std::unique_ptr<mojom::URLLoader> mojo_loader,
|
| + mojom::URLLoaderClientPtr mojo_loader_client,
|
| + ResourceLoaderDelegate* delegate);
|
| + ResourceLoader(std::unique_ptr<net::URLRequest> request,
|
| + std::unique_ptr<ResourceHandler> handler,
|
| + CertStore* cert_store,
|
| ResourceLoaderDelegate* delegate);
|
| ~ResourceLoader() override;
|
|
|
| @@ -63,6 +70,8 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
|
| return transferring_response_.get();
|
| }
|
|
|
| + mojom::URLLoaderClient* client() const { return mojo_loader_client_.get(); }
|
| +
|
| private:
|
| // net::URLRequest::Delegate implementation:
|
| void OnReceivedRedirect(net::URLRequest* request,
|
| @@ -140,6 +149,8 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
|
| std::unique_ptr<net::URLRequest> request_;
|
| std::unique_ptr<ResourceHandler> handler_;
|
| ResourceLoaderDelegate* delegate_;
|
| + std::unique_ptr<mojom::URLLoader> mojo_loader_;
|
| + mojom::URLLoaderClientPtr mojo_loader_client_;
|
|
|
| scoped_refptr<ResourceDispatcherHostLoginDelegate> login_delegate_;
|
| std::unique_ptr<SSLClientAuthHandler> ssl_client_auth_handler_;
|
|
|