Bug 1251238 - Part 2: Modify test because we notify chrome listener each time when service worker's state is updated. r=bkelly

--HG--
extra : rebase_source : 255c6771dc705c556e82789b1af9b04aed697a0b

dom/workers/test/serviceworkers/test_serviceworkerregistrationinfo.xul

@@ -58,11 +58,19 @@
                 ok(registration.activeWorker === null);
 
                 return waitForServiceWorkerRegistrationChange(registration, function () {
+                  // Activating
                   ok(registration.installingWorker === null);
                   ok(registration.waitingWorker === null);
                   ok(registration.activeWorker !== null);
 
-                  return registration;
+                  return waitForServiceWorkerRegistrationChange(registration, function () {
+                    // Activated
+                    ok(registration.installingWorker === null);
+                    ok(registration.waitingWorker === null);
+                    ok(registration.activeWorker !== null);
+
+                    return registration;
+                  });
                 });
               });
             });
@@ -83,11 +91,19 @@
               ok(registration.activeWorker !== null);
 
               return waitForServiceWorkerRegistrationChange(registration, function () {
+                // Activating
                 ok(registration.installingWorker === null);
                 ok(registration.waitingWorker === null);
                 ok(registration.activeWorker !== null);
 
-                return registration;
+                return waitForServiceWorkerRegistrationChange(registration, function () {
+                  // Activated
+                  ok(registration.installingWorker === null);
+                  ok(registration.waitingWorker === null);
+                  ok(registration.activeWorker !== null);
+
+                  return registration;
+                });
               });
             });
           });