| Index: content/browser/loader/resource_loader.h
|
| diff --git a/content/browser/loader/resource_loader.h b/content/browser/loader/resource_loader.h
|
| index 6eef282097e97e791a4bc42ae5e4dc6cb0b7be2c..5271703cf87863a095d4dbd62a7345a54c71df4e 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"
|
|
|
| @@ -38,6 +39,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;
|
|
|
| @@ -62,6 +69,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,
|
| @@ -131,6 +140,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_;
|
|
|