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
66 lines
2.9 KiB
JavaScript
66 lines
2.9 KiB
JavaScript
"use strict";
|
|
|
|
const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
|
|
const {ChromeMigrationUtils} = ChromeUtils.import("resource:///modules/ChromeMigrationUtils.jsm");
|
|
const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
|
|
|
|
function getRootPath() {
|
|
let dirKey;
|
|
if (AppConstants.platform == "win") {
|
|
dirKey = "winLocalAppDataDir";
|
|
} else if (AppConstants.platform == "macosx") {
|
|
dirKey = "macUserLibDir";
|
|
} else {
|
|
dirKey = "homeDir";
|
|
}
|
|
return OS.Constants.Path[dirKey];
|
|
}
|
|
|
|
add_task(async function test_getDataPath_function() {
|
|
let chromeUserDataPath = ChromeMigrationUtils.getDataPath("Chrome");
|
|
let chromiumUserDataPath = ChromeMigrationUtils.getDataPath("Chromium");
|
|
let canaryUserDataPath = ChromeMigrationUtils.getDataPath("Canary");
|
|
if (AppConstants.platform == "win") {
|
|
Assert.equal(chromeUserDataPath,
|
|
OS.Path.join(getRootPath(), "Google", "Chrome", "User Data"),
|
|
"Should get the path of Chrome data directory.");
|
|
Assert.equal(chromiumUserDataPath,
|
|
OS.Path.join(getRootPath(), "Chromium", "User Data"),
|
|
"Should get the path of Chromium data directory.");
|
|
Assert.equal(canaryUserDataPath,
|
|
OS.Path.join(getRootPath(), "Google", "Chrome SxS", "User Data"),
|
|
"Should get the path of Canary data directory.");
|
|
} else if (AppConstants.platform == "macosx") {
|
|
Assert.equal(chromeUserDataPath,
|
|
OS.Path.join(getRootPath(), "Application Support", "Google", "Chrome"),
|
|
"Should get the path of Chrome data directory.");
|
|
Assert.equal(chromiumUserDataPath,
|
|
OS.Path.join(getRootPath(), "Application Support", "Chromium"),
|
|
"Should get the path of Chromium data directory.");
|
|
Assert.equal(canaryUserDataPath,
|
|
OS.Path.join(getRootPath(), "Application Support", "Google", "Chrome Canary"),
|
|
"Should get the path of Canary data directory.");
|
|
} else {
|
|
Assert.equal(chromeUserDataPath,
|
|
OS.Path.join(getRootPath(), ".config", "google-chrome"),
|
|
"Should get the path of Chrome data directory.");
|
|
Assert.equal(chromiumUserDataPath,
|
|
OS.Path.join(getRootPath(), ".config", "chromium"),
|
|
"Should get the path of Chromium data directory.");
|
|
Assert.equal(canaryUserDataPath, null,
|
|
"Should get null for Canary.");
|
|
}
|
|
});
|
|
|
|
add_task(async function test_getExtensionPath_function() {
|
|
let extensionPath = ChromeMigrationUtils.getExtensionPath("Default");
|
|
let expectedPath;
|
|
if (AppConstants.platform == "win") {
|
|
expectedPath = OS.Path.join(getRootPath(), "Google", "Chrome", "User Data", "Default", "Extensions");
|
|
} else if (AppConstants.platform == "macosx") {
|
|
expectedPath = OS.Path.join(getRootPath(), "Application Support", "Google", "Chrome", "Default", "Extensions");
|
|
} else {
|
|
expectedPath = OS.Path.join(getRootPath(), ".config", "google-chrome", "Default", "Extensions");
|
|
}
|
|
Assert.equal(extensionPath, expectedPath, "Should get the path of extensions directory.");
|
|
});
|