| 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 75f308796010f677b82881070d1ecc4afcdd6948..4839af1763072dad570ba05b6aad8480f50a9cf7 100644
|
| --- a/content/browser/loader/url_loader_factory_impl.cc
|
| +++ b/content/browser/loader/url_loader_factory_impl.cc
|
| @@ -50,23 +50,43 @@ void URLLoaderFactoryImpl::CreateLoaderAndStart(
|
| int32_t request_id,
|
| const ResourceRequest& url_request,
|
| mojom::URLLoaderClientPtr client) {
|
| + CreateLoaderAndStart(std::move(request), routing_id, request_id, url_request,
|
| + std::move(client), resource_message_filter_.get());
|
| +}
|
| +
|
| +void URLLoaderFactoryImpl::SyncLoad(int32_t routing_id,
|
| + int32_t request_id,
|
| + const ResourceRequest& url_request,
|
| + const SyncLoadCallback& callback) {
|
| + SyncLoad(routing_id, request_id, url_request, callback,
|
| + resource_message_filter_.get());
|
| +}
|
| +
|
| +// static
|
| +void URLLoaderFactoryImpl::CreateLoaderAndStart(
|
| + mojom::URLLoaderRequest request,
|
| + int32_t routing_id,
|
| + int32_t request_id,
|
| + const ResourceRequest& url_request,
|
| + mojom::URLLoaderClientPtr client,
|
| + ResourceMessageFilter* filter) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
|
|
| ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get();
|
| rdh->OnRequestResourceWithMojo(routing_id, request_id, url_request,
|
| - std::move(request), std::move(client),
|
| - resource_message_filter_.get());
|
| + std::move(request), std::move(client), filter);
|
| }
|
|
|
| +// static
|
| void URLLoaderFactoryImpl::SyncLoad(int32_t routing_id,
|
| int32_t request_id,
|
| const ResourceRequest& url_request,
|
| - const SyncLoadCallback& callback) {
|
| + const SyncLoadCallback& callback,
|
| + ResourceMessageFilter* filter) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
|
|
| ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get();
|
| - rdh->OnSyncLoadWithMojo(routing_id, request_id, url_request,
|
| - resource_message_filter_.get(),
|
| + rdh->OnSyncLoadWithMojo(routing_id, request_id, url_request, filter,
|
| base::Bind(&DispatchSyncLoadResult, callback));
|
| }
|
|
|
|
|