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

Unified Diff: content/browser/service_worker/service_worker_url_job_wrapper.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_url_job_wrapper.cc
diff --git a/content/browser/service_worker/service_worker_url_job_wrapper.cc b/content/browser/service_worker/service_worker_url_job_wrapper.cc
index 41dbc205fec6c1ccdef88da63eac7de9b9a4ba08..32229e5b4f89a913d2d17d3a32b3be797acda952 100644
--- a/content/browser/service_worker/service_worker_url_job_wrapper.cc
+++ b/content/browser/service_worker/service_worker_url_job_wrapper.cc
@@ -19,9 +19,9 @@ ServiceWorkerURLJobWrapper::ServiceWorkerURLJobWrapper(
weak_factory_(this) {}
ServiceWorkerURLJobWrapper::ServiceWorkerURLJobWrapper(
- LoaderFactoryCallback callback)
+ URLLoaderCallback callback)
: job_type_(JobType::kURLLoader),
- loader_factory_callback_(std::move(callback)),
+ loader_callback_(std::move(callback)),
weak_factory_(this) {
DCHECK(IsBrowserSideNavigationEnabled() &&
base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -37,8 +37,8 @@ void ServiceWorkerURLJobWrapper::FallbackToNetwork() {
// call this synchronously here and don't wait for a separate async
// StartRequest cue like what URLRequestJob case does.
// TODO(kinuko): Make sure this is ok or we need to make this async.
- if (!loader_factory_callback_.is_null()) {
- std::move(loader_factory_callback_).Run(nullptr);
+ if (!loader_callback_.is_null()) {
+ std::move(loader_callback_).Run(nullptr);
}
} else {
url_request_job_->FallbackToNetwork();
@@ -104,7 +104,7 @@ void ServiceWorkerURLJobWrapper::FailDueToLostController() {
bool ServiceWorkerURLJobWrapper::WasCanceled() const {
if (job_type_ == JobType::kURLLoader) {
- return loader_factory_callback_.is_null();
+ return loader_callback_.is_null();
} else {
return !url_request_job_;
}

Powered by Google App Engine
This is Rietveld 408576698