| Index: content/child/resource_dispatcher.cc
|
| diff --git a/content/child/resource_dispatcher.cc b/content/child/resource_dispatcher.cc
|
| index 485168c074b536f028835996dcd879dbb6714c90..2a52bbd100b83485376fc37ea1e405dd07498b29 100644
|
| --- a/content/child/resource_dispatcher.cc
|
| +++ b/content/child/resource_dispatcher.cc
|
| @@ -39,7 +39,6 @@
|
| #include "content/public/common/content_features.h"
|
| #include "content/public/common/resource_response.h"
|
| #include "content/public/common/resource_type.h"
|
| -#include "mojo/public/cpp/bindings/associated_group.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/base/request_priority.h"
|
| #include "net/http/http_response_headers.h"
|
| @@ -654,8 +653,7 @@ int ResourceDispatcher::StartAsync(
|
| const url::Origin& frame_origin,
|
| std::unique_ptr<RequestPeer> peer,
|
| blink::WebURLRequest::LoadingIPCType ipc_type,
|
| - mojom::URLLoaderFactory* url_loader_factory,
|
| - mojo::AssociatedGroup* associated_group) {
|
| + mojom::URLLoaderFactory* url_loader_factory) {
|
| CheckSchemeForReferrerPolicy(*request);
|
|
|
| // Compute a unique request_id for this renderer process.
|
| @@ -674,10 +672,10 @@ int ResourceDispatcher::StartAsync(
|
| new URLLoaderClientImpl(request_id, this, main_thread_task_runner_));
|
| mojom::URLLoaderAssociatedPtr url_loader;
|
| mojom::URLLoaderClientAssociatedPtrInfo client_ptr_info;
|
| - client->Bind(&client_ptr_info, associated_group);
|
| - url_loader_factory->CreateLoaderAndStart(
|
| - MakeRequest(&url_loader, associated_group), routing_id, request_id,
|
| - *request, std::move(client_ptr_info));
|
| + client->Bind(&client_ptr_info);
|
| + url_loader_factory->CreateLoaderAndStart(MakeRequest(&url_loader),
|
| + routing_id, request_id, *request,
|
| + std::move(client_ptr_info));
|
| pending_requests_[request_id]->url_loader = std::move(url_loader);
|
| pending_requests_[request_id]->url_loader_client = std::move(client);
|
| } else {
|
|
|