Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1260)

Unified Diff: content/browser/service_worker/service_worker_controllee_request_handler.cc

Issue 2919313004: Get rid of URLLoaderFactory in browser-side case (Closed)
Patch Set: . Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/service_worker/service_worker_controllee_request_handler.cc
diff --git a/content/browser/service_worker/service_worker_controllee_request_handler.cc b/content/browser/service_worker/service_worker_controllee_request_handler.cc
index fd15aa27bd0cd1709a80094a4f0284f8d5aaa859..2af53dac136499ec04328e07898a66abac9977ce 100644
--- a/content/browser/service_worker/service_worker_controllee_request_handler.cc
+++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc
@@ -159,10 +159,10 @@ net::URLRequestJob* ServiceWorkerControlleeRequestHandler::MaybeCreateJob(
return job.release();
}
-void ServiceWorkerControlleeRequestHandler::MaybeCreateLoaderFactory(
+void ServiceWorkerControlleeRequestHandler::MaybeCreateLoader(
const ResourceRequest& resource_request,
ResourceContext* resource_context,
- base::OnceCallback<void(mojom::URLLoaderFactory*)> factory_callback) {
+ LoaderCallback callback) {
DCHECK(is_main_resource_load_);
ClearJob();
@@ -171,7 +171,7 @@ void ServiceWorkerControlleeRequestHandler::MaybeCreateLoaderFactory(
if (!context_ || !provider_host_) {
// We can't do anything other than to fall back to network.
- std::move(factory_callback).Run(nullptr);
+ std::move(callback).Run(StartLoaderCallback());
return;
}
@@ -180,8 +180,7 @@ void ServiceWorkerControlleeRequestHandler::MaybeCreateLoaderFactory(
DCHECK(!use_network_);
url_job_ = base::MakeUnique<ServiceWorkerURLJobWrapper>(
- std::move(factory_callback), this, resource_request,
- blob_storage_context_);
+ std::move(callback), this, resource_request, blob_storage_context_);
resource_context_ = resource_context;

Powered by Google App Engine
This is Rietveld 408576698