summaryrefslogtreecommitdiff
path: root/chromium/content/renderer/navigation_client.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/content/renderer/navigation_client.cc
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/renderer/navigation_client.cc')
-rw-r--r--chromium/content/renderer/navigation_client.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/content/renderer/navigation_client.cc b/chromium/content/renderer/navigation_client.cc
index c86b9f7f6be..0d9b602a12f 100644
--- a/chromium/content/renderer/navigation_client.cc
+++ b/chromium/content/renderer/navigation_client.cc
@@ -25,7 +25,7 @@ void NavigationClient::CommitNavigation(
base::Optional<std::vector<::content::mojom::TransferrableURLLoaderPtr>>
subresource_overrides,
blink::mojom::ControllerServiceWorkerInfoPtr controller_service_worker_info,
- blink::mojom::ServiceWorkerProviderInfoForClientPtr provider_info,
+ blink::mojom::ServiceWorkerContainerInfoForClientPtr container_info,
mojo::PendingRemote<network::mojom::URLLoaderFactory>
prefetch_loader_factory,
const base::UnguessableToken& devtools_navigation_token,
@@ -35,12 +35,12 @@ void NavigationClient::CommitNavigation(
// race conditions leading to the early deletion of NavigationRequest would
// unexpectedly abort the ongoing navigation. Remove when the races are fixed.
ResetDisconnectionHandler();
- render_frame_->CommitPerNavigationMojoInterfaceNavigation(
+ render_frame_->CommitNavigation(
std::move(common_params), std::move(commit_params),
std::move(response_head), std::move(response_body),
std::move(url_loader_client_endpoints), std::move(subresource_loaders),
std::move(subresource_overrides),
- std::move(controller_service_worker_info), std::move(provider_info),
+ std::move(controller_service_worker_info), std::move(container_info),
std::move(prefetch_loader_factory), devtools_navigation_token,
std::move(callback));
}