[ServiceWorker] waitUntil() should wait until all promises got resolved/rejected.

third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.cpp

Index: third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.cpp
diff --git a/third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.cpp b/third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.cpp
index 839f336a2d17707a5f95b998d9b2cb2cfe5e688f..968ee26a76442eccc994a789da7205c59252ab46 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.cpp
+++ b/third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.cpp
@@ -65,7 +65,7 @@ class WaitUntilObserver::ThenFunction final : public ScriptFunction {
     ASSERT(observer_);
     ASSERT(resolve_type_ == kFulfilled || resolve_type_ == kRejected);
     if (resolve_type_ == kRejected) {
-      observer_->ReportError(value);
+      observer_->ReportPromiseRejected(value);
       value =
           ScriptPromise::Reject(value.GetScriptState(), value).GetScriptValue();
     }
@@ -143,11 +143,11 @@ WaitUntilObserver::WaitUntilObserver(ExecutionContext* context,
           this,
           &WaitUntilObserver::ConsumeWindowInteraction) {}
 
-void WaitUntilObserver::ReportError(const ScriptValue& value) {
+void WaitUntilObserver::ReportPromiseRejected(const ScriptValue& value) {
   // FIXME: Propagate error message to the client for onerror handling.

[leonhsl(Using Gerrit), 2017/05/08 10:33:48]

ServiceWorker spec does not have such requirement, can we just remove this
FIXME?

   NOTIMPLEMENTED();

[leonhsl(Using Gerrit), 2017/05/08 10:33:48]

I'm confused why NOTIMPLEMENTED() here does not crash.. IIRC NOTIMPLEMENTED() in
Chromium codes does crash, while it's different in Blink codes?

[falken, 2017/05/09 04:00:25]

I think it's fine to delete the FIXME and the NOTIMPLEMENTED, they are from
ancient times.

[leonhsl(Using Gerrit), 2017/05/09 07:26:52]

Done.

 
-  has_error_ = true;
+  has_rejected_promise_ = true;
 }
 
 void WaitUntilObserver::IncrementPendingActivity() {
@@ -162,8 +162,9 @@ void WaitUntilObserver::DecrementPendingActivity() {
   ServiceWorkerGlobalScopeClient* client =
       ServiceWorkerGlobalScopeClient::From(execution_context_);
   WebServiceWorkerEventResult result =
-      has_error_ ? kWebServiceWorkerEventResultRejected
-                 : kWebServiceWorkerEventResultCompleted;
+      (has_error_ || has_rejected_promise_)
+          ? kWebServiceWorkerEventResultRejected
+          : kWebServiceWorkerEventResultCompleted;
   switch (type_) {
     case kActivate:
       client->DidHandleActivateEvent(event_id_, result, event_dispatch_time_);