Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 01:35:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1596918: Follow-up: Fix more rebase bustage.

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D56266

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Kris Maglione 2019-12-07 00:22:38 +00:00
parent 6f930e61d3
commit a89b63b446
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/base/content/test/webextensions/browser_permissions_mozAddonManager.js
View File

@ -10,7 +10,11 @@ async function installMozAM(filename) {
gBrowser.selectedBrowser,
[`${BASE}/${filename}`],
async function(url) {
await content.wrappedJSObject.installMozAM(url);
try {
await content.wrappedJSObject.installMozAM(url);
} catch (e) {
Cu.reportError(e);
}
}
);
}

4
browser/modules/test/browser/browser_preloading_tab_moving.js
View File

@ -68,11 +68,11 @@ add_task(async function moving_works() {
await BrowserTestUtils.closeWindow(newWin);
tab = BrowserTestUtils.addTab(gBrowser, BROWSER_NEW_TAB_URL);
await SpecialPowers.spawn(tab.linkedBrowser, [], function() {
await ContentTask.spawn(tab.linkedBrowser, null, function() {
return ContentTaskUtils.waitForCondition(() => {
return content.document.readyState == "complete";
});
}).catch(Cu.reportError);
});
ok(true, "Managed to open a tab in the original window still.");

4
dom/tests/browser/browser_hasbeforeunload.js
View File

@ -226,7 +226,7 @@ function removeSubframeFrom(browser, frameDepth = 0) {
* @return {Promise}
*/
function controlFrameAt(browser, frameDepth, command) {
return SpecialPowers.spawn(browser, [{ frameDepth, command }], async function(
return ContentTask.spawn(browser, { frameDepth, command }, async function(
args
) {
ChromeUtils.import("resource://testing-common/TestUtils.jsm", this);
@ -313,7 +313,7 @@ function controlFrameAt(browser, frameDepth, command) {
break;
}
}
}).catch(Cu.reportError);
});
}
/**

2
toolkit/mozapps/extensions/test/browser/browser_webapi_uninstall.js
View File

@ -16,7 +16,7 @@ function testWithAPI(task) {
}
function API_uninstallByID(browser, id) {
return SpecialPowers.spawn(browser, [id], async function(id) {
return ContentTask.spawn(browser, id, async function(id) {
let addon = await content.navigator.mozAddonManager.getAddonByID(id);
let result = await addon.uninstall();