Index: content/browser/service_worker/service_worker_register_job.cc |
diff --git a/content/browser/service_worker/service_worker_register_job.cc b/content/browser/service_worker/service_worker_register_job.cc |
index 2fcdbfb1a63cae53e7632d897fe9b0641f083d60..2627fb75d6ba79c600d02bd53cfb94c085e1fd61 100644 |
--- a/content/browser/service_worker/service_worker_register_job.cc |
+++ b/content/browser/service_worker/service_worker_register_job.cc |
@@ -37,12 +37,14 @@ typedef ServiceWorkerRegisterJobBase::RegistrationJobType RegistrationJobType; |
ServiceWorkerRegisterJob::ServiceWorkerRegisterJob( |
base::WeakPtr<ServiceWorkerContextCore> context, |
- const GURL& pattern, |
- const GURL& script_url) |
+ const GURL& script_url, |
+ const ServiceWorkerRegistrationOptions& options) |
: context_(context), |
job_type_(REGISTRATION_JOB), |
- pattern_(pattern), |
+ pattern_(options.scope), |
script_url_(script_url), |
+ use_cache_(options.use_cache == |
+ ServiceWorkerRegistrationOptions::UseCache::Use), |
phase_(INITIAL), |
doom_installing_worker_(false), |
is_promise_resolved_(false), |
@@ -60,6 +62,7 @@ ServiceWorkerRegisterJob::ServiceWorkerRegisterJob( |
: context_(context), |
job_type_(UPDATE_JOB), |
pattern_(registration->pattern()), |
+ use_cache_(registration->use_cache()), |
phase_(INITIAL), |
doom_installing_worker_(false), |
is_promise_resolved_(false), |
@@ -288,8 +291,8 @@ void ServiceWorkerRegisterJob::RegisterAndContinue() { |
return; |
} |
- set_registration( |
- new ServiceWorkerRegistration(pattern_, registration_id, context_)); |
+ set_registration(new ServiceWorkerRegistration(pattern_, use_cache_, |
+ registration_id, context_)); |
AddRegistrationToMatchingProviderHosts(registration()); |
UpdateAndContinue(); |
} |