1 files changed, 29 insertions, 18 deletions
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile2.js b/toolkit/mozapps/extensions/test/xpinstall/browser_localfile2.js
index b0e3ffc42..253ed15b9 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile2.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_localfile2.js
@@ -1,38 +1,49 @@
 // ----------------------------------------------------------------------------
 // Test whether an install fails if the url is a local file when requested from
 // web content
-add_task(function* test() {
+function test() {
+  waitForExplicitFinish();
+
   var cr = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
                      .getService(Components.interfaces.nsIChromeRegistry);
-
-  var chromeroot = getChromeRoot(gTestPath);
-  var xpipath = chromeroot + "amosigned.xpi";
+  
+  var chromeroot = getChromeRoot(gTestPath);              
   try {
-    xpipath = cr.convertChromeURL(makeURI(xpipath)).spec;
+    var xpipath = cr.convertChromeURL(makeURI(chromeroot + "unsigned.xpi")).spec;
   } catch (ex) {
-    // scenario where we are running from a .jar and already extracted
+    var xpipath = chromeroot + "unsigned.xpi"; //scenario where we are running from a .jar and already extracted
   }
-
+  
   var triggers = encodeURIComponent(JSON.stringify({
     "Unsigned XPI": xpipath
   }));
+  gBrowser.selectedTab = gBrowser.addTab();
+
+  function loadListener() {
+    gBrowser.selectedBrowser.removeEventListener("load", loadListener, true);
+    gBrowser.contentWindow.addEventListener("InstallTriggered", page_loaded, false);
+  }
+
+  gBrowser.selectedBrowser.addEventListener("load", loadListener, true);
 
   // In non-e10s the exception in the content page would trigger a test failure
   if (!gMultiProcessBrowser)
     expectUncaughtException();
 
-  let URI = TESTROOT + "installtrigger.html?" + triggers;
-  yield BrowserTestUtils.withNewTab({ gBrowser, url: "about:blank" }, function* (browser) {
-    yield ContentTask.spawn(browser, URI, function* (URI) {
-      content.location.href = URI;
+  gBrowser.loadURI(TESTROOT + "installtrigger.html?" + triggers);
+}
 
-      let loaded = ContentTaskUtils.waitForEvent(this, "load", true);
-      let installTriggered = ContentTaskUtils.waitForEvent(this, "InstallTriggered", true, null, true);
-      yield Promise.all([ loaded, installTriggered ]);
+function page_loaded() {
+  gBrowser.contentWindow.removeEventListener("InstallTriggered", page_loaded, false);
+  var doc = gBrowser.contentDocument;
+  is(doc.getElementById("return").textContent, "exception", "installTrigger should have failed");
 
-      let doc = content.document;
-      is(doc.getElementById("return").textContent, "exception", "installTrigger should have failed");
-    });
+  // In non-e10s the exception from the page is thrown after the event so we
+  // have to spin the event loop to make sure it arrives so expectUncaughtException
+  // sees it.
+  executeSoon(() => {
+    gBrowser.removeCurrentTab();
+    finish();
   });
-});
+}
 // ----------------------------------------------------------------------------