1 files changed, 14 insertions, 19 deletions
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_enabled2.js b/toolkit/mozapps/extensions/test/xpinstall/browser_enabled2.js
index cc1b8a8b2..290987bda 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_enabled2.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_enabled2.js
@@ -7,26 +7,21 @@ function test() {
 
   gBrowser.selectedTab = gBrowser.addTab();
 
-  ContentTask.spawn(gBrowser.selectedBrowser, TESTROOT + "enabled.html", function (url) {
-    return new Promise(resolve => {
-      function page_loaded() {
-        content.removeEventListener("PageLoaded", page_loaded, false);
-        resolve(content.document.getElementById("enabled").textContent);
-      }
+  function loadListener() {
+    gBrowser.selectedBrowser.removeEventListener("load", loadListener, true);
+    gBrowser.contentWindow.addEventListener("PageLoaded", page_loaded, false);
+  }
 
-      function load_listener() {
-        removeEventListener("load", load_listener, true);
-        content.addEventListener("PageLoaded", page_loaded, false);
-      }
+  gBrowser.selectedBrowser.addEventListener("load", loadListener, true);
+  gBrowser.loadURI(TESTROOT + "enabled.html");
+}
 
-      addEventListener("load", load_listener, true);
+function page_loaded() {
+  gBrowser.contentWindow.removeEventListener("PageLoaded", page_loaded, false);
+  Services.prefs.clearUserPref("xpinstall.enabled");
 
-      content.location.href = url;
-    });
-  }).then(text => {
-    is(text, "false", "installTrigger should have not been enabled");
-    Services.prefs.clearUserPref("xpinstall.enabled");
-    gBrowser.removeCurrentTab();
-    finish();
-  });
+  var doc = gBrowser.contentDocument;
+  is(doc.getElementById("enabled").textContent, "false", "installTrigger should have not been enabled");
+  gBrowser.removeCurrentTab();
+  finish();
 }