| Index: content/browser/loader/resource_loader.cc
|
| diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
|
| index 2bc362262e8949e709da6b8c16ea643ae6de9697..eeea4c5cc352638b18b801c92e190c25e051dd13 100644
|
| --- a/content/browser/loader/resource_loader.cc
|
| +++ b/content/browser/loader/resource_loader.cc
|
| @@ -138,11 +138,15 @@ void PopulateResourceResponse(ResourceRequestInfoImpl* info,
|
| ResourceLoader::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)
|
| : deferred_stage_(DEFERRED_NONE),
|
| request_(std::move(request)),
|
| handler_(std::move(handler)),
|
| delegate_(delegate),
|
| + mojo_loader_(std::move(mojo_loader)),
|
| + mojo_loader_client_(std::move(mojo_loader_client)),
|
| is_transferring_(false),
|
| times_cancelled_before_request_start_(0),
|
| started_request_(false),
|
| @@ -153,6 +157,17 @@ ResourceLoader::ResourceLoader(std::unique_ptr<net::URLRequest> request,
|
| handler_->SetController(this);
|
| }
|
|
|
| +ResourceLoader::ResourceLoader(std::unique_ptr<net::URLRequest> request,
|
| + std::unique_ptr<ResourceHandler> handler,
|
| + CertStore* cert_store,
|
| + ResourceLoaderDelegate* delegate)
|
| + : ResourceLoader(std::move(request),
|
| + std::move(handler),
|
| + cert_store,
|
| + nullptr,
|
| + nullptr,
|
| + delegate) {}
|
| +
|
| ResourceLoader::~ResourceLoader() {
|
| if (login_delegate_.get())
|
| login_delegate_->OnRequestCancelled();
|
|
|