fune/docshell/test/browser/browser_bug349769.js
Nika Layzell 42028efc71 Bug 1671983 - Part 4: Stop awaiting BrowserTestUtils.loadURI, r=annyG,remote-protocol-reviewers,extension-reviewers,preferences-reviewers,whimboo,zombie
This method only is async in order to allow callers to wait for a process switch
triggered by the call to `loadURI` to be finished before resolving. With
DocumentChannel, we should never trigger a process switch eagerly like this
again, so we don't need any of the async behaviour here anymore.

This part is largely mechanical changes to tests, removing the `await` calls on
`loadURI`, and a follow-up part will remove the actual async logic from
`BrowserTestUtils.loadURI`.

Differential Revision: https://phabricator.services.mozilla.com/D94641
2020-11-12 18:01:03 +00:00

72 lines
2 KiB
JavaScript

add_task(async function test() {
const uris = [undefined, "about:blank"];
function checkContentProcess(newBrowser, uri) {
return ContentTask.spawn(newBrowser, [uri], async function(uri) {
var prin = content.document.nodePrincipal;
Assert.notEqual(
prin,
null,
"Loaded principal must not be null when adding " + uri
);
Assert.notEqual(
prin,
undefined,
"Loaded principal must not be undefined when loading " + uri
);
Assert.equal(
prin.isSystemPrincipal,
false,
"Loaded principal must not be system when loading " + uri
);
});
}
for (var uri of uris) {
await BrowserTestUtils.withNewTab({ gBrowser }, async function(newBrowser) {
let loadedPromise = BrowserTestUtils.browserLoaded(newBrowser);
BrowserTestUtils.loadURI(newBrowser, uri);
var prin = newBrowser.contentPrincipal;
isnot(
prin,
null,
"Forced principal must not be null when loading " + uri
);
isnot(
prin,
undefined,
"Forced principal must not be undefined when loading " + uri
);
is(
prin.isSystemPrincipal,
false,
"Forced principal must not be system when loading " + uri
);
// Belt-and-suspenders e10s check: make sure that the same checks hold
// true in the content process.
await checkContentProcess(newBrowser, uri);
await loadedPromise;
prin = newBrowser.contentPrincipal;
isnot(prin, null, "Loaded principal must not be null when adding " + uri);
isnot(
prin,
undefined,
"Loaded principal must not be undefined when loading " + uri
);
is(
prin.isSystemPrincipal,
false,
"Loaded principal must not be system when loading " + uri
);
// Belt-and-suspenders e10s check: make sure that the same checks hold
// true in the content process.
await checkContentProcess(newBrowser, uri);
});
}
});