| Index: content/browser/loader/resource_dispatcher_host_impl.h
|
| diff --git a/content/browser/loader/resource_dispatcher_host_impl.h b/content/browser/loader/resource_dispatcher_host_impl.h
|
| index 70f377e30619a43c1c6872efd39212591199572b..eb0f11b8683816688cd9cc6829bd923862ffe6a7 100644
|
| --- a/content/browser/loader/resource_dispatcher_host_impl.h
|
| +++ b/content/browser/loader/resource_dispatcher_host_impl.h
|
| @@ -282,7 +282,7 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
|
| int routing_id,
|
| int request_id,
|
| const ResourceRequest& request,
|
| - mojom::URLLoaderAssociatedRequest mojo_request,
|
| + mojom::URLLoaderRequest mojo_request,
|
| mojom::URLLoaderClientPtr url_loader_client);
|
|
|
| void OnSyncLoadWithMojo(ResourceRequesterInfo* requester_info,
|
| @@ -538,7 +538,7 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
|
| int routing_id,
|
| int request_id,
|
| const ResourceRequest& request_data,
|
| - mojom::URLLoaderAssociatedRequest mojo_request,
|
| + mojom::URLLoaderRequest mojo_request,
|
| mojom::URLLoaderClientPtr url_loader_client);
|
|
|
| void OnSyncLoad(ResourceRequesterInfo* requester_info,
|
| @@ -555,7 +555,7 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
|
| int request_id,
|
| const ResourceRequest& request_data,
|
| LoaderMap::iterator iter,
|
| - mojom::URLLoaderAssociatedRequest mojo_request,
|
| + mojom::URLLoaderRequest mojo_request,
|
| mojom::URLLoaderClientPtr url_loader_client);
|
|
|
| // If |request_data| is for a request being transferred from another process,
|
| @@ -564,7 +564,7 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
|
| int request_id,
|
| const ResourceRequest& request_data,
|
| int route_id,
|
| - mojom::URLLoaderAssociatedRequest mojo_request,
|
| + mojom::URLLoaderRequest mojo_request,
|
| mojom::URLLoaderClientPtr url_loader_client);
|
|
|
| void BeginRequest(
|
| @@ -573,7 +573,7 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
|
| const ResourceRequest& request_data,
|
| const SyncLoadResultCallback& sync_result_handler, // only valid for sync
|
| int route_id,
|
| - mojom::URLLoaderAssociatedRequest mojo_request,
|
| + mojom::URLLoaderRequest mojo_request,
|
| mojom::URLLoaderClientPtr url_loader_client);
|
|
|
| // There are requests which need decisions to be made like the following:
|
| @@ -591,7 +591,7 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
|
| const SyncLoadResultCallback& sync_result_handler, // only valid for sync
|
| int route_id,
|
| const net::HttpRequestHeaders& headers,
|
| - mojom::URLLoaderAssociatedRequest mojo_request,
|
| + mojom::URLLoaderRequest mojo_request,
|
| mojom::URLLoaderClientPtr url_loader_client,
|
| HeaderInterceptorResult interceptor_result);
|
|
|
| @@ -605,13 +605,13 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
|
| int route_id,
|
| int child_id,
|
| ResourceContext* resource_context,
|
| - mojom::URLLoaderAssociatedRequest mojo_request,
|
| + mojom::URLLoaderRequest mojo_request,
|
| mojom::URLLoaderClientPtr url_loader_client);
|
|
|
| // Creates either MojoAsyncResourceHandler or AsyncResourceHandler.
|
| std::unique_ptr<ResourceHandler> CreateBaseResourceHandler(
|
| net::URLRequest* request,
|
| - mojom::URLLoaderAssociatedRequest mojo_request,
|
| + mojom::URLLoaderRequest mojo_request,
|
| mojom::URLLoaderClientPtr url_loader_client,
|
| ResourceType resource_type);
|
|
|
|
|