[ServiceWorker] Check is_uninstalled in ServiceWorkerRegisterJob::ContinueWithRegistration()

content/browser/service_worker/service_worker_registration.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/service_worker_registration.h"
 
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_info.h"
 #include "content/browser/service_worker/service_worker_register_job.h"
 #include "content/browser/service_worker/service_worker_utils.h"
@@ skipping 12 matching lines @@
 }  // namespace
 
 ServiceWorkerRegistration::ServiceWorkerRegistration(
     const GURL& pattern,
     int64 registration_id,
     base::WeakPtr<ServiceWorkerContextCore> context)
     : pattern_(pattern),
       registration_id_(registration_id),
       is_deleted_(false),
       is_uninstalling_(false),
+      is_uninstalled_(false),
       should_activate_when_ready_(false),
       context_(context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(context_);
   context_->AddLiveRegistration(this);
 }
 
 ServiceWorkerRegistration::~ServiceWorkerRegistration() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!listeners_.might_have_observers());
@@ skipping 265 matching lines @@
     mask.add(ChangedVersionAttributesMask::ACTIVE_VERSION);
   }
   if (mask.changed()) {
     ServiceWorkerRegistrationInfo info = GetInfo();
     FOR_EACH_OBSERVER(Listener, listeners_,
                       OnVersionAttributesChanged(this, mask, info));
   }
 
   FOR_EACH_OBSERVER(
       Listener, listeners_, OnRegistrationFinishedUninstalling(this));
+  is_uninstalled_ = true;

[michaeln, 2014/09/11 19:31:40]

Would it make sense to set this flag immediately after line 290? Between there
and here, a whole lot of observer methods are called and they'll see a reg that
is not uninstalling and also not uninstalled. Thats inconsistent with the new
found way to represent is_uninstalled.

[horo, 2014/09/12 01:09:25]

That's make sense.
Done.

Thank you.

 }
 
 void ServiceWorkerRegistration::OnRestoreFinished(
     const StatusCallback& callback,
     scoped_refptr<ServiceWorkerVersion> version,
     ServiceWorkerStatusCode status) {
   if (!context_) {
     callback.Run(ServiceWorkerStatusCode::SERVICE_WORKER_ERROR_ABORT);
     return;
   }
   context_->storage()->NotifyDoneInstallingRegistration(
       this, version.get(), status);
   callback.Run(status);
 }
 
 }  // namespace content