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
185 lines
5.2 KiB
JavaScript
185 lines
5.2 KiB
JavaScript
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
|
|
/* vim: set sts=2 sw=2 et tw=80: */
|
|
"use strict";
|
|
|
|
XPCOMUtils.defineLazyGetter(this, "Management", () => {
|
|
// eslint-disable-next-line no-shadow
|
|
const {Management} = ChromeUtils.import("resource://gre/modules/Extension.jsm", null);
|
|
return Management;
|
|
});
|
|
|
|
ChromeUtils.defineModuleGetter(this, "AddonManager",
|
|
"resource://gre/modules/AddonManager.jsm");
|
|
ChromeUtils.defineModuleGetter(this, "ExtensionPreferencesManager",
|
|
"resource://gre/modules/ExtensionPreferencesManager.jsm");
|
|
ChromeUtils.defineModuleGetter(this, "Preferences",
|
|
"resource://gre/modules/Preferences.jsm");
|
|
|
|
const {
|
|
createAppInfo,
|
|
promiseShutdownManager,
|
|
promiseStartupManager,
|
|
} = AddonTestUtils;
|
|
|
|
AddonTestUtils.init(this);
|
|
|
|
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "42");
|
|
|
|
function awaitEvent(eventName) {
|
|
return new Promise(resolve => {
|
|
let listener = (_eventName, ...args) => {
|
|
if (_eventName === eventName) {
|
|
Management.off(eventName, listener);
|
|
resolve(...args);
|
|
}
|
|
};
|
|
|
|
Management.on(eventName, listener);
|
|
});
|
|
}
|
|
|
|
function awaitPrefChange(prefName) {
|
|
return new Promise(resolve => {
|
|
let listener = (args) => {
|
|
Preferences.ignore(prefName, listener);
|
|
resolve();
|
|
};
|
|
|
|
Preferences.observe(prefName, listener);
|
|
});
|
|
}
|
|
|
|
add_task(async function test_disable() {
|
|
const OLD_ID = "old_id@tests.mozilla.org";
|
|
const NEW_ID = "new_id@tests.mozilla.org";
|
|
|
|
const PREF_TO_WATCH = "network.http.speculative-parallel-limit";
|
|
|
|
// Create an object to hold the values to which we will initialize the prefs.
|
|
const PREFS = {
|
|
"network.predictor.enabled": true,
|
|
"network.prefetch-next": true,
|
|
"network.http.speculative-parallel-limit": 10,
|
|
"network.dns.disablePrefetch": false,
|
|
};
|
|
|
|
// Set prefs to our initial values.
|
|
for (let pref in PREFS) {
|
|
Preferences.set(pref, PREFS[pref]);
|
|
}
|
|
|
|
registerCleanupFunction(() => {
|
|
// Reset the prefs.
|
|
for (let pref in PREFS) {
|
|
Preferences.reset(pref);
|
|
}
|
|
});
|
|
|
|
function checkPrefs(expected) {
|
|
for (let pref in PREFS) {
|
|
let msg = `${pref} set correctly.`;
|
|
let expectedValue = expected ? PREFS[pref] : !PREFS[pref];
|
|
if (pref === "network.http.speculative-parallel-limit") {
|
|
expectedValue = expected ? ExtensionPreferencesManager.getDefaultValue(pref) : 0;
|
|
}
|
|
equal(Preferences.get(pref), expectedValue, msg);
|
|
}
|
|
}
|
|
|
|
async function background() {
|
|
browser.test.onMessage.addListener(async (msg, data) => {
|
|
await browser.privacy.network.networkPredictionEnabled.set(data);
|
|
let settingData = await browser.privacy.network.networkPredictionEnabled.get({});
|
|
browser.test.sendMessage("privacyData", settingData);
|
|
});
|
|
}
|
|
|
|
await promiseStartupManager();
|
|
|
|
let testExtensions = [
|
|
ExtensionTestUtils.loadExtension({
|
|
background,
|
|
manifest: {
|
|
applications: {
|
|
gecko: {
|
|
id: OLD_ID,
|
|
},
|
|
},
|
|
permissions: ["privacy"],
|
|
},
|
|
useAddonManager: "temporary",
|
|
}),
|
|
|
|
ExtensionTestUtils.loadExtension({
|
|
background,
|
|
manifest: {
|
|
applications: {
|
|
gecko: {
|
|
id: NEW_ID,
|
|
},
|
|
},
|
|
permissions: ["privacy"],
|
|
},
|
|
useAddonManager: "temporary",
|
|
}),
|
|
];
|
|
|
|
for (let extension of testExtensions) {
|
|
await extension.startup();
|
|
}
|
|
|
|
// Set the value to true for the older extension.
|
|
testExtensions[0].sendMessage("set", {value: true});
|
|
let data = await testExtensions[0].awaitMessage("privacyData");
|
|
ok(data.value, "Value set to true for the older extension.");
|
|
|
|
// Set the value to false for the newest extension.
|
|
testExtensions[1].sendMessage("set", {value: false});
|
|
data = await testExtensions[1].awaitMessage("privacyData");
|
|
ok(!data.value, "Value set to false for the newest extension.");
|
|
|
|
// Verify the prefs have been set to match the "false" setting.
|
|
checkPrefs(false);
|
|
|
|
// Disable the newest extension.
|
|
let disabledPromise = awaitPrefChange(PREF_TO_WATCH);
|
|
let newAddon = await AddonManager.getAddonByID(NEW_ID);
|
|
await newAddon.disable();
|
|
await disabledPromise;
|
|
|
|
// Verify the prefs have been set to match the "true" setting.
|
|
checkPrefs(true);
|
|
|
|
// Disable the older extension.
|
|
disabledPromise = awaitPrefChange(PREF_TO_WATCH);
|
|
let oldAddon = await AddonManager.getAddonByID(OLD_ID);
|
|
await oldAddon.disable();
|
|
await disabledPromise;
|
|
|
|
// Verify the prefs have reverted back to their initial values.
|
|
for (let pref in PREFS) {
|
|
equal(Preferences.get(pref), PREFS[pref], `${pref} reset correctly.`);
|
|
}
|
|
|
|
// Re-enable the newest extension.
|
|
let enabledPromise = awaitEvent("ready");
|
|
await newAddon.enable();
|
|
await enabledPromise;
|
|
|
|
// Verify the prefs have been set to match the "false" setting.
|
|
checkPrefs(false);
|
|
|
|
// Re-enable the older extension.
|
|
enabledPromise = awaitEvent("ready");
|
|
await oldAddon.enable();
|
|
await enabledPromise;
|
|
|
|
// Verify the prefs have remained set to match the "false" setting.
|
|
checkPrefs(false);
|
|
|
|
for (let extension of testExtensions) {
|
|
await extension.unload();
|
|
}
|
|
|
|
await promiseShutdownManager();
|
|
});
|