service worker: Update job gets the script url when the job starts

content/browser/service_worker/service_worker_register_job.cc

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 8cd8bd53d740028f0d2b409ff71a05f2646d00e4..9ec1d8964eeec2ae53ff0b8403662e8b3a19e951 100644
--- a/content/browser/service_worker/service_worker_register_job.cc
+++ b/content/browser/service_worker/service_worker_register_job.cc
@@ -58,7 +58,6 @@ ServiceWorkerRegisterJob::ServiceWorkerRegisterJob(
     : context_(context),
       job_type_(UPDATE_JOB),
       pattern_(registration->pattern()),
-      script_url_(registration->GetNewestVersion()->script_url()),
       phase_(INITIAL),
       doom_installing_worker_(false),
       is_promise_resolved_(false),
@@ -126,10 +125,13 @@ void ServiceWorkerRegisterJob::Abort() {
 }
 
 bool ServiceWorkerRegisterJob::Equals(ServiceWorkerRegisterJobBase* job) const {
-  if (job->GetType() != GetType())
+  if (job->GetType() != job_type_)
     return false;
   ServiceWorkerRegisterJob* register_job =
       static_cast<ServiceWorkerRegisterJob*>(job);
+  if (job_type_ == UPDATE_JOB)
+    return register_job->pattern_ == pattern_;
+  DCHECK(job_type_ == REGISTRATION_JOB);

[nhiroki, 2016/04/28 05:51:46]

DCHECK_EQ(REGISTRATION_JOB, job_type_);

[falken, 2016/04/28 06:25:17]

Done.

   return register_job->pattern_ == pattern_ &&
          register_job->script_url_ == script_url_;
 }
@@ -257,18 +259,18 @@ void ServiceWorkerRegisterJob::ContinueWithUpdate(
     return;
   }
 
-  // A previous job may have unregistered or installed a new version to this
-  // registration.
+  // A previous job may have unregistered this registration.
   if (registration()->is_uninstalling() ||
-      registration()->GetNewestVersion()->script_url() != script_url_) {
+      !registration()->GetNewestVersion()) {
     Complete(SERVICE_WORKER_ERROR_NOT_FOUND);
     return;
   }
 
+  script_url_ = registration()->GetNewestVersion()->script_url();

[nhiroki, 2016/04/28 05:51:46]

Can we have DCHECK(script_url_.is_empty()) immediately before this assignment?

[falken, 2016/04/28 06:25:17]

Good idea. Done.

+
   // TODO(michaeln): If the last update check was less than 24 hours
   // ago, depending on the freshness of the cached worker script we
   // may be able to complete the update job right here.
-
   UpdateAndContinue();
 }