ServiceWorker: Update worker state when waitUntil rejected.

content/browser/service_worker/service_worker_version.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_version.h"
 
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "content/browser/service_worker/embedded_worker_instance.h"
@@ skipping 545 matching lines @@
 
 void ServiceWorkerVersion::OnActivateEventFinished(
     int request_id,
     blink::WebServiceWorkerEventResult result) {
   StatusCallback* callback = activate_callbacks_.Lookup(request_id);
   if (!callback) {
     NOTREACHED() << "Got unexpected message: " << request_id;
     return;
   }
   ServiceWorkerStatusCode status = SERVICE_WORKER_OK;
-  if (result == blink::WebServiceWorkerEventResultRejected)
+  if (result == blink::WebServiceWorkerEventResultRejected) {
     status = SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED;
-  else
+    SetStatus(REDUNDANT);
+  } else {
     SetStatus(ACTIVE);
+  }
 
   scoped_refptr<ServiceWorkerVersion> protect(this);
   callback->Run(status);
   activate_callbacks_.Remove(request_id);
 }
 
 void ServiceWorkerVersion::OnInstallEventFinished(
     int request_id,
     blink::WebServiceWorkerEventResult result) {
   StatusCallback* callback = install_callbacks_.Lookup(request_id);
   if (!callback) {
     NOTREACHED() << "Got unexpected message: " << request_id;
     return;
   }
   ServiceWorkerStatusCode status = SERVICE_WORKER_OK;
-  if (result == blink::WebServiceWorkerEventResultRejected)
+  if (result == blink::WebServiceWorkerEventResultRejected) {
     status = SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED;
-  else
+    SetStatus(REDUNDANT);
+  } else {
     SetStatus(INSTALLED);
+  }
 
   scoped_refptr<ServiceWorkerVersion> protect(this);
   callback->Run(status);
   install_callbacks_.Remove(request_id);
 }
 
 void ServiceWorkerVersion::OnFetchEventFinished(
     int request_id,
     ServiceWorkerFetchEventResult result,
     const ServiceWorkerResponse& response) {
@@ skipping 55 matching lines @@
     return;
   }
   stop_worker_timer_.Start(
       FROM_HERE, base::TimeDelta::FromSeconds(kStopWorkerDelay),
       base::Bind(&ServiceWorkerVersion::StopWorker,
                  weak_factory_.GetWeakPtr(),
                  base::Bind(&ServiceWorkerUtils::NoOpStatusCallback)));
 }
 
 }  // namespace content