Backed out changeset 2560659cda95 (bug 1318273)

browser/components/sessionstore/test/head.js

@@ -548,7 +548,9 @@ function pushPrefs(...aPrefs) {
 }
 
 function popPrefs() {
-  return SpecialPowers.popPrefEnv();
+  return new Promise(resolve => {
+    SpecialPowers.popPrefEnv(resolve);
+  });
 }
 
 function* checkScroll(tab, expected, msg) {

browser/modules/test/browser_ProcessHangNotifications.js

@@ -32,7 +32,10 @@ function pushPrefs(...aPrefs) {
 }
 
 function popPrefs() {
-  return SpecialPowers.popPrefEnv();
+  return new Promise((resolve) => {
+    SpecialPowers.popPrefEnv(resolve);
+    resolve();
+  });
 }
 
 let gTestHangReport = {

dom/security/test/general/test_block_script_wrong_mime.html

@@ -91,8 +91,8 @@ SpecialPowers.pushPrefEnv({set: [["security.block_script_with_wrong_mime", true]
   }).then(() => {
     return Promise.all(MIMETypes.map(testWorkerImportScripts));
   }).then(() => {
-    return SpecialPowers.popPrefEnv();
-  }).then(SimpleTest.finish);
+    SpecialPowers.popPrefEnv(SimpleTest.finish);
+  });
 });
 
 </script>

dom/workers/test/serviceworkers/test_installation_simple.html

@@ -48,7 +48,7 @@
     }, function(e) {
       ok(e.name === "SecurityError", "Should fail with a SecurityError");
     }).then(function() {
-      return SpecialPowers.popPrefEnv();
+      return new Promise((resolve) => SpecialPowers.popPrefEnv(resolve));
     });
   }
 

toolkit/components/places/tests/browser/browser_visituri_nohistory.js

@@ -27,7 +27,7 @@ add_task(function* ()
 
   yield BrowserTestUtils.openNewForegroundTab(gBrowser, INITIAL_URL);
 
-  yield SpecialPowers.popPrefEnv();
+  yield new Promise(resolve => SpecialPowers.popPrefEnv(resolve));
 
   let browserLoadedPromise = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
   gBrowser.loadURI(FINAL_URL);

toolkit/content/tests/browser/browser_bug295977_autoscroll_overflow.js

@@ -127,7 +127,7 @@ body > div > div {width: 1000px;height: 1000px;}\
                                            gBrowser.selectedBrowser);
 
     if (prefsChanged) {
-      yield SpecialPowers.popPrefEnv();
+      yield new Promise(resolve => SpecialPowers.popPrefEnv(resolve));
     }
 
     // Start checking for the scroll.