Commit 60bad374 authored by Morten Stenshorne's avatar Morten Stenshorne Committed by Commit Bot

[jumbo] Avoid duplicate CreateSubresourceLoaderFactory

TBR=kinuko@chromium.org

Change-Id: I4038a30f19cc582469b16eb4f0625cd12a4ccf5a
Reviewed-on: https://chromium-review.googlesource.com/1116543
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Reviewed-by: default avatarMorten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570703}
parent 18b2ef60
...@@ -35,7 +35,7 @@ namespace content { ...@@ -35,7 +35,7 @@ namespace content {
namespace { namespace {
void CreateSubresourceLoaderFactory( void CreateSubresourceLoaderFactoryForProviderContext(
mojom::ServiceWorkerContainerHostPtrInfo container_host_info, mojom::ServiceWorkerContainerHostPtrInfo container_host_info,
mojom::ControllerServiceWorkerPtrInfo controller_ptr_info, mojom::ControllerServiceWorkerPtrInfo controller_ptr_info,
const std::string& client_id, const std::string& client_id,
...@@ -218,7 +218,7 @@ ServiceWorkerProviderContext::GetSubresourceLoaderFactory() { ...@@ -218,7 +218,7 @@ ServiceWorkerProviderContext::GetSubresourceLoaderFactory() {
{base::MayBlock(), base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}); {base::MayBlock(), base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN});
task_runner->PostTask( task_runner->PostTask(
FROM_HERE, FROM_HERE,
base::BindOnce(&CreateSubresourceLoaderFactory, base::BindOnce(&CreateSubresourceLoaderFactoryForProviderContext,
CloneContainerHostPtrInfo(), CloneContainerHostPtrInfo(),
std::move(state->controller_endpoint), state->client_id, std::move(state->controller_endpoint), state->client_id,
state->fallback_loader_factory->Clone(), state->fallback_loader_factory->Clone(),
......
...@@ -36,7 +36,7 @@ WorkerFetchContextImpl::RewriteURLFunction g_rewrite_url = nullptr; ...@@ -36,7 +36,7 @@ WorkerFetchContextImpl::RewriteURLFunction g_rewrite_url = nullptr;
namespace { namespace {
// Runs on IO thread. // Runs on IO thread.
void CreateSubresourceLoaderFactory( void CreateSubresourceLoaderFactoryForWorker(
mojom::ServiceWorkerContainerHostPtrInfo container_host_info, mojom::ServiceWorkerContainerHostPtrInfo container_host_info,
const std::string& client_id, const std::string& client_id,
std::unique_ptr<network::SharedURLLoaderFactoryInfo> fallback_factory, std::unique_ptr<network::SharedURLLoaderFactoryInfo> fallback_factory,
...@@ -395,8 +395,9 @@ void WorkerFetchContextImpl::ResetServiceWorkerURLLoaderFactory() { ...@@ -395,8 +395,9 @@ void WorkerFetchContextImpl::ResetServiceWorkerURLLoaderFactory() {
{base::MayBlock(), base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}); {base::MayBlock(), base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN});
task_runner->PostTask( task_runner->PostTask(
FROM_HERE, FROM_HERE,
base::BindOnce(&CreateSubresourceLoaderFactory, std::move(host_ptr_info), base::BindOnce(&CreateSubresourceLoaderFactoryForWorker,
client_id_, fallback_factory_->Clone(), std::move(host_ptr_info), client_id_,
fallback_factory_->Clone(),
mojo::MakeRequest(&service_worker_url_loader_factory))); mojo::MakeRequest(&service_worker_url_loader_factory)));
web_loader_factory_->SetServiceWorkerURLLoaderFactory( web_loader_factory_->SetServiceWorkerURLLoaderFactory(
std::move(service_worker_url_loader_factory)); std::move(service_worker_url_loader_factory));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment