Bug 1273920 P4 Fix bugs in dom/push/test_serviceworker_lifetime.html test. r=kitcambridge

dom/push/test/lifetime_worker.js

@@ -55,6 +55,11 @@ onmessage = function(event) {
 }
 
 onpush = function(event) {
+  var pushResolve;
+  event.waitUntil(new Promise(function(resolve) {
+    pushResolve = resolve;
+  }));
+
   // FIXME(catalinb): push message carry no data. So we assume the only
   // push message we get is "wait"
   clients.matchAll().then(function(client) {
@@ -65,11 +70,10 @@ onpush = function(event) {
     client[0].postMessage({type: "push", state: state});
 
     state = "wait";
-    event.waitUntil(new Promise(function(res, rej) {
-      if (resolvePromiseCallback) {
-        dump("ERROR: service worker was already waiting on a promise.\n");
-      }
-      resolvePromiseCallback = res;
-    }));
+    if (resolvePromiseCallback) {
+      dump("ERROR: service worker was already waiting on a promise.\n");
+    } else {
+      resolvePromiseCallback = pushResolve;
+    }
   });
 }

dom/push/test/test_serviceworker_lifetime.html

@@ -257,7 +257,7 @@
         .then(setShutdownObserver(false))
         .then(checkStateAndUpdate(pushEvent, "from_scope", "wait"))
         .then(setShutdownObserver(true))
-        .then(checkStateAndUpdate(messageEventIframe, "wait", "update"))
+        .then(checkStateAndUpdate(messageEventIframe, "wait", "release"))
         .then(waitOnShutdownObserver)
         .then(closeIframe)
     }