| 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 4cb4c9191ab3c3acd845407e3b659ebc26c2fa84..4ddd57bf2b52fd0c0567148ddf4571bdbb7e9988 100644
|
| --- a/content/browser/service_worker/service_worker_register_job.cc
|
| +++ b/content/browser/service_worker/service_worker_register_job.cc
|
| @@ -95,8 +95,8 @@ ServiceWorkerRegistration* ServiceWorkerRegisterJob::registration() {
|
|
|
| void ServiceWorkerRegisterJob::set_pending_version(
|
| ServiceWorkerVersion* version) {
|
| - DCHECK(phase_ == UPDATE || phase_ == ACTIVATE) << phase_;
|
| - DCHECK(!internal_.pending_version || !version);
|
| + DCHECK(phase_ == UPDATE) << phase_;
|
| + DCHECK(!internal_.pending_version);
|
| internal_.pending_version = version;
|
| }
|
|
|
| @@ -375,7 +375,8 @@ void ServiceWorkerRegisterJob::Complete(ServiceWorkerStatusCode status) {
|
| ResolvePromise(status, NULL, NULL);
|
| }
|
| DCHECK(callbacks_.empty());
|
| - context_->storage()->NotifyDoneInstallingRegistration(registration());
|
| + if (registration())
|
| + context_->storage()->NotifyDoneInstallingRegistration(registration());
|
| context_->job_coordinator()->FinishJob(pattern_, this);
|
| }
|
|
|
| @@ -400,7 +401,7 @@ void ServiceWorkerRegisterJob::AssociatePendingVersionToDocuments(
|
| ServiceWorkerVersion* version) {
|
| // TODO(michaeln): This needs to respect the longest prefix wins
|
| // when it comes to finding a registration for a document url.
|
| - // This should should utilize storage->FindRegistrationForDocument().
|
| + // This should utilize storage->FindRegistrationForDocument().
|
| for (scoped_ptr<ServiceWorkerContextCore::ProviderHostIterator> it =
|
| context_->GetProviderHostIterator();
|
| !it->IsAtEnd();
|
|
|