| Index: content/browser/loader/url_loader_factory_impl.cc
|
| diff --git a/content/browser/loader/url_loader_factory_impl.cc b/content/browser/loader/url_loader_factory_impl.cc
|
| index 21a878c3b9af472b8a81869a9c95472cd568f313..588f0a6c7e4edd791ec33dc32a2eac8a60ecaab8 100644
|
| --- a/content/browser/loader/url_loader_factory_impl.cc
|
| +++ b/content/browser/loader/url_loader_factory_impl.cc
|
| @@ -45,13 +45,14 @@ URLLoaderFactoryImpl::~URLLoaderFactoryImpl() {
|
| }
|
|
|
| void URLLoaderFactoryImpl::CreateLoaderAndStart(
|
| - mojom::URLLoaderRequest request,
|
| + mojom::URLLoaderAssociatedRequest request,
|
| int32_t routing_id,
|
| int32_t request_id,
|
| const ResourceRequest& url_request,
|
| - mojom::URLLoaderClientPtr client) {
|
| + mojom::URLLoaderClientAssociatedPtrInfo client_ptr_info) {
|
| CreateLoaderAndStart(std::move(request), routing_id, request_id, url_request,
|
| - std::move(client), resource_message_filter_.get());
|
| + std::move(client_ptr_info),
|
| + resource_message_filter_.get());
|
| }
|
|
|
| void URLLoaderFactoryImpl::SyncLoad(int32_t routing_id,
|
| @@ -63,14 +64,17 @@ void URLLoaderFactoryImpl::SyncLoad(int32_t routing_id,
|
| }
|
|
|
| void URLLoaderFactoryImpl::CreateLoaderAndStart(
|
| - mojom::URLLoaderRequest request,
|
| + mojom::URLLoaderAssociatedRequest request,
|
| int32_t routing_id,
|
| int32_t request_id,
|
| const ResourceRequest& url_request,
|
| - mojom::URLLoaderClientPtr client,
|
| + mojom::URLLoaderClientAssociatedPtrInfo client_ptr_info,
|
| ResourceMessageFilter* filter) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
|
|
| + mojom::URLLoaderClientAssociatedPtr client;
|
| + client.Bind(std::move(client_ptr_info));
|
| +
|
| ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get();
|
| rdh->OnRequestResourceWithMojo(routing_id, request_id, url_request,
|
| std::move(request), std::move(client), filter);
|
|
|