1 files changed, 8 insertions, 7 deletions
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js b/toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js
index bf919d89c..3613e95b0 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js
@@ -1,12 +1,13 @@
 // Test that having two frames that request installs at the same time doesn't
 // cause callback ID conflicts (discussed in bug 926712)
 
-var gConcurrentTabs = [];
-var gQueuedForInstall = [];
-var gResults = [];
+let {Promise} = Cu.import("resource://gre/modules/Promise.jsm");
+
+let gConcurrentTabs = [];
+let gQueuedForInstall = [];
+let gResults = [];
 
 function frame_script() {
-  /* globals addMessageListener, sendAsyncMessage*/
   addMessageListener("Test:StartInstall", () => {
     content.document.getElementById("installnow").click()
   });
@@ -20,7 +21,7 @@ function frame_script() {
   }, true);
 }
 
-var gAddonAndWindowListener = {
+let gAddonAndWindowListener = {
   onOpenWindow: function(win) {
     var window = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindow);
     info("Window opened");
@@ -80,8 +81,8 @@ function test() {
     Services.prefs.clearUserPref(PREF_LOGGING_ENABLED);
     Services.prefs.clearUserPref(PREF_INSTALL_REQUIRESECUREORIGIN);
 
-    Services.perms.remove(makeURI("http://example.com"), "install");
-    Services.perms.remove(makeURI("http://example.org"), "install");
+    Services.perms.remove("example.com", "install");
+    Services.perms.remove("example.org", "install");
 
     while (gConcurrentTabs.length) {
       gBrowser.removeTab(gConcurrentTabs.shift());