forked from mirrors/gecko-dev
e930b89c34
***
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
70 lines
2.7 KiB
JavaScript
70 lines
2.7 KiB
JavaScript
"use strict";
|
|
|
|
var {MigrationUtils, MigratorPrototype} = ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
|
|
var {LoginHelper} = ChromeUtils.import("resource://gre/modules/LoginHelper.jsm");
|
|
var {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
|
|
var {PlacesUtils} = ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
|
|
var {Preferences} = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
|
|
var {PromiseUtils} = ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
|
|
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
|
var {TestUtils} = ChromeUtils.import("resource://testing-common/TestUtils.jsm");
|
|
var {PlacesTestUtils} = ChromeUtils.import("resource://testing-common/PlacesTestUtils.jsm");
|
|
|
|
XPCOMUtils.defineLazyGlobalGetters(this, [ "URL" ]);
|
|
|
|
ChromeUtils.defineModuleGetter(this, "FileUtils",
|
|
"resource://gre/modules/FileUtils.jsm");
|
|
ChromeUtils.defineModuleGetter(this, "Sqlite",
|
|
"resource://gre/modules/Sqlite.jsm");
|
|
|
|
// Initialize profile.
|
|
var gProfD = do_get_profile();
|
|
|
|
var {getAppInfo, newAppInfo, updateAppInfo} = ChromeUtils.import("resource://testing-common/AppInfo.jsm");
|
|
updateAppInfo();
|
|
|
|
/**
|
|
* Migrates the requested resource and waits for the migration to be complete.
|
|
*/
|
|
async function promiseMigration(migrator, resourceType, aProfile = null) {
|
|
// Ensure resource migration is available.
|
|
let availableSources = await migrator.getMigrateData(aProfile, false);
|
|
Assert.ok((availableSources & resourceType) > 0, "Resource supported by migrator");
|
|
|
|
return new Promise(resolve => {
|
|
Services.obs.addObserver(function onMigrationEnded() {
|
|
Services.obs.removeObserver(onMigrationEnded, "Migration:Ended");
|
|
resolve();
|
|
}, "Migration:Ended");
|
|
|
|
migrator.migrate(resourceType, null, aProfile);
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Replaces a directory service entry with a given nsIFile.
|
|
*/
|
|
function registerFakePath(key, file) {
|
|
let dirsvc = Services.dirsvc.QueryInterface(Ci.nsIProperties);
|
|
let originalFile;
|
|
try {
|
|
// If a file is already provided save it and undefine, otherwise set will
|
|
// throw for persistent entries (ones that are cached).
|
|
originalFile = dirsvc.get(key, Ci.nsIFile);
|
|
dirsvc.undefine(key);
|
|
} catch (e) {
|
|
// dirsvc.get will throw if nothing provides for the key and dirsvc.undefine
|
|
// will throw if it's not a persistent entry, in either case we don't want
|
|
// to set the original file in cleanup.
|
|
originalFile = undefined;
|
|
}
|
|
|
|
dirsvc.set(key, file);
|
|
registerCleanupFunction(() => {
|
|
dirsvc.undefine(key);
|
|
if (originalFile) {
|
|
dirsvc.set(key, originalFile);
|
|
}
|
|
});
|
|
}
|