mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-19 00:05:36 +00:00
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
97 lines
2.4 KiB
JavaScript
97 lines
2.4 KiB
JavaScript
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
"use strict";
|
|
|
|
var EXPORTED_SYMBOLS = [
|
|
"makeFakeAppDir",
|
|
];
|
|
|
|
const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
|
|
const {Promise} = ChromeUtils.import("resource://gre/modules/Promise.jsm");
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
// Reference needed in order for fake app dir provider to be active.
|
|
var gFakeAppDirectoryProvider;
|
|
|
|
/**
|
|
* Installs a fake UAppData directory.
|
|
*
|
|
* This is needed by tests because a UAppData directory typically isn't
|
|
* present in the test environment.
|
|
*
|
|
* We create the new UAppData directory under the profile's directory
|
|
* because the profile directory is automatically cleaned as part of
|
|
* test shutdown.
|
|
*
|
|
* This returns a promise that will be resolved once the new directory
|
|
* is created and installed.
|
|
*/
|
|
var makeFakeAppDir = function() {
|
|
let dirMode = OS.Constants.libc.S_IRWXU;
|
|
let baseFile = Services.dirsvc.get("ProfD", Ci.nsIFile);
|
|
let appD = baseFile.clone();
|
|
appD.append("UAppData");
|
|
|
|
if (gFakeAppDirectoryProvider) {
|
|
return Promise.resolve(appD.path);
|
|
}
|
|
|
|
function makeDir(f) {
|
|
if (f.exists()) {
|
|
return;
|
|
}
|
|
|
|
dump("Creating directory: " + f.path + "\n");
|
|
f.create(Ci.nsIFile.DIRECTORY_TYPE, dirMode);
|
|
}
|
|
|
|
makeDir(appD);
|
|
|
|
let reportsD = appD.clone();
|
|
reportsD.append("Crash Reports");
|
|
|
|
let pendingD = reportsD.clone();
|
|
pendingD.append("pending");
|
|
let submittedD = reportsD.clone();
|
|
submittedD.append("submitted");
|
|
|
|
makeDir(reportsD);
|
|
makeDir(pendingD);
|
|
makeDir(submittedD);
|
|
|
|
let provider = {
|
|
getFile(prop, persistent) {
|
|
persistent.value = true;
|
|
if (prop == "UAppData") {
|
|
return appD.clone();
|
|
}
|
|
|
|
throw Cr.NS_ERROR_FAILURE;
|
|
},
|
|
|
|
QueryInterace(iid) {
|
|
if (iid.equals(Ci.nsIDirectoryServiceProvider) ||
|
|
iid.equals(Ci.nsISupports)) {
|
|
return this;
|
|
}
|
|
|
|
throw Cr.NS_ERROR_NO_INTERFACE;
|
|
},
|
|
};
|
|
|
|
// Register the new provider.
|
|
Services.dirsvc.registerProvider(provider);
|
|
|
|
// And undefine the old one.
|
|
try {
|
|
Services.dirsvc.undefine("UAppData");
|
|
} catch (ex) {}
|
|
|
|
gFakeAppDirectoryProvider = provider;
|
|
|
|
dump("Successfully installed fake UAppDir\n");
|
|
return Promise.resolve(appD.path);
|
|
};
|