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
92 lines
3 KiB
JavaScript
92 lines
3 KiB
JavaScript
var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
|
|
|
|
|
// This url must sync with the table, url in SafeBrowsing.jsm addMozEntries
|
|
const PHISH_TABLE = "test-phish-simple";
|
|
const PHISH_URL = "https://www.itisatrap.org/firefox/its-a-trap.html";
|
|
|
|
/**
|
|
* 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.
|
|
* @param [optional] event
|
|
* The load event type to wait for. Defaults to "load".
|
|
* @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, eventType = "load") {
|
|
info(`Wait tab event: ${eventType}`);
|
|
|
|
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;
|
|
if (eventType === "load") {
|
|
loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, handle);
|
|
} else {
|
|
// No need to use handle.
|
|
loaded =
|
|
BrowserTestUtils.waitForContentEvent(tab.linkedBrowser, eventType,
|
|
true, undefined, true);
|
|
}
|
|
|
|
if (url)
|
|
BrowserTestUtils.loadURI(tab.linkedBrowser, url);
|
|
|
|
return loaded;
|
|
}
|
|
|
|
// This function is mostly ported from classifierCommon.js
|
|
// under toolkit/components/url-classifier/tests/mochitest.
|
|
function waitForDBInit(callback) {
|
|
// Since there are two cases that may trigger the callback,
|
|
// we have to carefully avoid multiple callbacks and observer
|
|
// leaking.
|
|
let didCallback = false;
|
|
function callbackOnce() {
|
|
if (!didCallback) {
|
|
Services.obs.removeObserver(obsFunc, "mozentries-update-finished");
|
|
callback();
|
|
}
|
|
didCallback = true;
|
|
}
|
|
|
|
// The first part: listen to internal event.
|
|
function obsFunc() {
|
|
ok(true, "Received internal event!");
|
|
callbackOnce();
|
|
}
|
|
Services.obs.addObserver(obsFunc, "mozentries-update-finished");
|
|
|
|
// The second part: we might have missed the event. Just do
|
|
// an internal database lookup to confirm if the url has been
|
|
// added.
|
|
let principal = Services.scriptSecurityManager
|
|
.createCodebasePrincipal(Services.io.newURI(PHISH_URL), {});
|
|
|
|
let dbService = Cc["@mozilla.org/url-classifier/dbservice;1"]
|
|
.getService(Ci.nsIUrlClassifierDBService);
|
|
dbService.lookup(principal, PHISH_TABLE, value => {
|
|
if (value === PHISH_TABLE) {
|
|
ok(true, "DB lookup success!");
|
|
callbackOnce();
|
|
}
|
|
});
|
|
}
|
|
|
|
Services.prefs.setCharPref("urlclassifier.malwareTable", "test-malware-simple,test-unwanted-simple,test-harmful.simple");
|
|
Services.prefs.setCharPref("urlclassifier.phishTable", "test-phish-simple");
|
|
Services.prefs.setCharPref("urlclassifier.blockedTable", "test-block-simple");
|
|
SafeBrowsing.init();
|