From 0bfc8665198b389ca43b45fe7a36a31c7b7d169c Mon Sep 17 00:00:00 2001
From: Catalin Badea <catalin.badea392@gmail.com>
Date: Tue, 4 Nov 2014 13:04:00 +0100
Subject: [PATCH] Bug 982726 - Patch 1.5 - Update getServiced test and fix an
 assert when the registration has been removed. r=baku

---
 dom/workers/ServiceWorkerManager.cpp          |  7 +++-
 .../serviceworkers/sw_clients/simple.html     |  9 ++++--
 .../serviceworkers/test_get_serviced.html     | 32 +++++++++++++++----
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp
index 03546c004bea..dcd16209a65f 100644
--- a/dom/workers/ServiceWorkerManager.cpp
+++ b/dom/workers/ServiceWorkerManager.cpp
@@ -2185,7 +2185,12 @@ ServiceWorkerManager::GetServicedClients(const nsCString& aScope,
   nsRefPtr<ServiceWorkerDomainInfo> domainInfo = GetDomainInfo(aScope);
   nsRefPtr<ServiceWorkerRegistrationInfo> registration =
     domainInfo->GetRegistration(aScope);
-  MOZ_ASSERT(registration);
+
+  if (!registration) {
+    // The registration was removed, leave the array empty.
+    return;
+  }
+
   FilterRegistrationData data(aControlledDocuments, registration);
 
   domainInfo->mControlledDocuments.EnumerateRead(EnumControlledDocuments,
diff --git a/dom/workers/test/serviceworkers/sw_clients/simple.html b/dom/workers/test/serviceworkers/sw_clients/simple.html
index 6b1551928d35..0267b9200adf 100644
--- a/dom/workers/test/serviceworkers/sw_clients/simple.html
+++ b/dom/workers/test/serviceworkers/sw_clients/simple.html
@@ -15,9 +15,14 @@
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
-  window.onload = function() {
-    opener.postMessage("READY", "*");
+  if (!parent) {
+    info("sw_clients/simple.html shouldn't be launched directly!");
   }
+
+  navigator.serviceWorker.ready.then(function() {
+    parent.postMessage("READY", "*");
+  });
+
 </script>
 </pre>
 </body>
diff --git a/dom/workers/test/serviceworkers/test_get_serviced.html b/dom/workers/test/serviceworkers/test_get_serviced.html
index 8c47401a079d..18c0bed426a6 100644
--- a/dom/workers/test/serviceworkers/test_get_serviced.html
+++ b/dom/workers/test/serviceworkers/test_get_serviced.html
@@ -16,12 +16,25 @@
 <script class="testbody" type="text/javascript">
   // get_serviced_worker will call getServiced until the worker shuts down.
   // Test passes if the browser doesn't crash on leaked promise objects.
-  var controlled_window;
+  var registration;
+  var content;
+  var iframe;
+
   function simpleRegister() {
-    return navigator.serviceWorker.register("get_serviced_worker.js", { scope: "./sw_clients/" });
+    return navigator.serviceWorker.register("get_serviced_worker.js",
+                                            { scope: "./sw_clients/" })
+      .then((swr) => registration = swr);
   }
 
-  function openWindow() {
+  function closeAndUnregister() {
+    content.removeChild(iframe);
+
+    return registration.unregister().then(function(result) {
+      ok(result, "Unregister should return true.");
+    });
+  }
+
+  function openClient() {
     var p = new Promise(function(resolve, reject) {
       window.onmessage = function(e) {
         if (e.data === "READY") {
@@ -30,18 +43,25 @@
       }
     });
 
-    controlled_window = window.open("sw_clients/simple.html");
+    content = document.getElementById("content");
+    ok(content, "Parent exists.");
+
+    iframe = document.createElement("iframe");
+    iframe.setAttribute('src', "sw_clients/simple.html");
+    content.appendChild(iframe);
+
     return p;
   }
 
   function runTest() {
     simpleRegister()
-      .then(openWindow).catch(function(e) {
+      .then(openClient)
+      .then(closeAndUnregister)
+      .catch(function(e) {
         ok(false, "Some test failed with error " + e);
       }).then(function() {
         ok(true, "Didn't crash on resolving getServiced promises while worker shuts down.");
         SimpleTest.finish();
-        controlled_window.close();
       });
   }