forked from mirrors/gecko-dev
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
81 lines
2.2 KiB
JavaScript
81 lines
2.2 KiB
JavaScript
var {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm");
|
|
|
|
/**
|
|
* Waits for a load (or custom) event to finish in a given tab. If provided
|
|
* load an uri into the tab.
|
|
*
|
|
* @param tab
|
|
* The tab to load into.
|
|
* @param [optional] url
|
|
* The url to load, or the current url.
|
|
* @return {Promise} resolved when the event is handled.
|
|
* @resolves to the received event
|
|
* @rejects if a valid load event is not received within a meaningful interval
|
|
*/
|
|
function promiseTabLoadEvent(tab, url) {
|
|
info("Wait tab event: load");
|
|
|
|
function handle(loadedUrl) {
|
|
if (loadedUrl === "about:blank" || (url && loadedUrl !== url)) {
|
|
info(`Skipping spurious load event for ${loadedUrl}`);
|
|
return false;
|
|
}
|
|
|
|
info("Tab event received: load");
|
|
return true;
|
|
}
|
|
|
|
let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, handle);
|
|
|
|
if (url)
|
|
BrowserTestUtils.loadURI(tab.linkedBrowser, url);
|
|
|
|
return loaded;
|
|
}
|
|
|
|
function openIdentityPopup() {
|
|
let mainView = document.getElementById("identity-popup-mainView");
|
|
let viewShown = BrowserTestUtils.waitForEvent(mainView, "ViewShown");
|
|
gIdentityHandler._identityBox.click();
|
|
return viewShown;
|
|
}
|
|
|
|
function waitForSecurityChange(numChanges = 1, win = null) {
|
|
if (!win) {
|
|
win = window;
|
|
}
|
|
return new Promise(resolve => {
|
|
let n = 0;
|
|
let listener = {
|
|
onSecurityChange() {
|
|
n = n + 1;
|
|
info("Received onSecurityChange event " + n + " of " + numChanges);
|
|
if (n >= numChanges) {
|
|
win.gBrowser.removeProgressListener(listener);
|
|
resolve(n);
|
|
}
|
|
},
|
|
};
|
|
win.gBrowser.addProgressListener(listener);
|
|
});
|
|
}
|
|
|
|
function waitForContentBlockingEvent(numChanges = 1, win = null) {
|
|
if (!win) {
|
|
win = window;
|
|
}
|
|
return new Promise(resolve => {
|
|
let n = 0;
|
|
let listener = {
|
|
onContentBlockingEvent() {
|
|
n = n + 1;
|
|
info("Received onContentBlockingEvent event " + n + " of " + numChanges);
|
|
if (n >= numChanges) {
|
|
win.gBrowser.removeProgressListener(listener);
|
|
resolve(n);
|
|
}
|
|
},
|
|
};
|
|
win.gBrowser.addProgressListener(listener);
|
|
});
|
|
}
|