Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 898315 - Update all callers of FileUtils.getDir to remove usage of the shouldCreate parameter. r=Gijs,extension-reviewers,application-update-reviewers,nalexander,robwu

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D180603
This commit is contained in:
Marco Castelluccio 2023-06-14 20:55:52 +00:00
parent dbe7784f1b
commit c85e65e2e0
52 changed files with 154 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
browser/components/downloads/test/unit/test_DownloadLastDir_basics.js
View File

@ -28,13 +28,16 @@ add_task(
"Untracked URI, no pref set"
);
let dir1 = FileUtils.getDir("TmpD", ["dir1"], true);
let dir1 = FileUtils.getDir("TmpD", ["dir1"]);
dir1.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
let uri1 = Services.io.newURI("https://test1.moz.org");
downloadLastDir.setFile(uri1, dir1);
let dir2 = FileUtils.getDir("TmpD", ["dir2"], true);
let dir2 = FileUtils.getDir("TmpD", ["dir2"]);
dir2.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
let uri2 = Services.io.newURI("https://test2.moz.org");
downloadLastDir.setFile(uri2, dir2);
let dir3 = FileUtils.getDir("TmpD", ["dir3"], true);
let dir3 = FileUtils.getDir("TmpD", ["dir3"]);
dir3.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
downloadLastDir.setFile(null, dir3);
Assert.equal(
(await downloadLastDir.getFileAsync(uri1)).path,
@ -76,7 +79,8 @@ add_task(
// file: URIs should all point to the same folder.
let fileUri1 = Services.io.newURI("file:///c:/test.txt");
downloadLastDir.setFile(uri1, dir3);
let dir4 = FileUtils.getDir("TmpD", ["dir4"], true);
let dir4 = FileUtils.getDir("TmpD", ["dir4"]);
dir4.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
let fileUri2 = Services.io.newURI("file:///d:/test.png");
downloadLastDir.setFile(uri1, dir4);
Assert.equal(

3
browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload_smoketest.js
View File

@ -53,7 +53,8 @@ async function installTestAddon(addonId, unpacked = false) {
// in XPInstall.jsm).
const random = Math.round(Math.random() * 36 ** 3).toString(36);
const tmpDirName = `mochitest_unpacked_addons_${random}`;
let tmpExtPath = FileUtils.getDir("TmpD", [tmpDirName], true);
let tmpExtPath = FileUtils.getDir("TmpD", [tmpDirName]);
tmpExtPath.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerCleanupFunction(() => {
tmpExtPath.remove(true);
});

14
browser/components/extensions/test/browser/browser_ext_tabs_saveAsPDF.js
View File

@ -9,11 +9,8 @@ async function testReturnStatus(expectedStatus) {
"http://example.net/"
);
let saveDir = FileUtils.getDir(
"TmpD",
[`testSaveDir-${Math.random()}`],
true
);
let saveDir = FileUtils.getDir("TmpD", [`testSaveDir-${Math.random()}`]);
saveDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
let saveFile = saveDir.clone();
saveFile.append("testSaveFile.pdf");
@ -119,11 +116,8 @@ async function testFileName(expectedFileName) {
"http://example.net/"
);
let saveDir = FileUtils.getDir(
"TmpD",
[`testSaveDir-${Math.random()}`],
true
);
let saveDir = FileUtils.getDir("TmpD", [`testSaveDir-${Math.random()}`]);
saveDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
let saveFile = saveDir.clone();
saveFile.append(expectedFileName);

51
browser/components/migration/SafariProfileMigrator.sys.mjs
View File

@ -86,11 +86,10 @@ Bookmarks.prototype = {
// Thus, we must create a map from bookmark URLs -> their favicon entry's UUID.
let bookmarkURLToUUIDMap = new Map();
const faviconFolder = FileUtils.getDir(
"ULibDir",
["Safari", "Favicon Cache"],
false
).path;
const faviconFolder = FileUtils.getDir("ULibDir", [
"Safari",
"Favicon Cache",
]).path;
let dbPath = PathUtils.join(faviconFolder, "favicons.db");
try {
@ -272,11 +271,10 @@ Bookmarks.prototype = {
let favicons = [];
let convertedEntries = [];
const faviconFolder = FileUtils.getDir(
"ULibDir",
["Safari", "Favicon Cache"],
false
).path;
const faviconFolder = FileUtils.getDir("ULibDir", [
"Safari",
"Favicon Cache",
]).path;
for (const entry of entries) {
let type = entry.get("WebBookmarkType");
@ -349,11 +347,7 @@ Bookmarks.prototype = {
};
async function GetHistoryResource() {
let dbPath = FileUtils.getDir(
"ULibDir",
["Safari", "History.db"],
false
).path;
let dbPath = FileUtils.getDir("ULibDir", ["Safari", "History.db"]).path;
let maxAge = msToNSDate(
Date.now() - MigrationUtils.HISTORY_MAX_AGE_IN_MILLISECONDS
);
@ -540,7 +534,7 @@ export class SafariProfileMigrator extends MigratorBase {
}
async getResources() {
let profileDir = FileUtils.getDir("ULibDir", ["Safari"], false);
let profileDir = FileUtils.getDir("ULibDir", ["Safari"]);
if (!profileDir.exists()) {
return null;
}
@ -576,7 +570,7 @@ export class SafariProfileMigrator extends MigratorBase {
}
async getLastUsedDate() {
const profileDir = FileUtils.getDir("ULibDir", ["Safari"], false);
const profileDir = FileUtils.getDir("ULibDir", ["Safari"]);
const dates = await Promise.all(
["Bookmarks.plist", "History.db"].map(file => {
const path = PathUtils.join(profileDir.path, file);
@ -594,16 +588,15 @@ export class SafariProfileMigrator extends MigratorBase {
return true;
}
// Check if we have access to both bookmarks and favicons:
let bookmarkTarget = FileUtils.getDir(
"ULibDir",
["Safari", "Bookmarks.plist"],
false
);
let faviconTarget = FileUtils.getDir(
"ULibDir",
["Safari", "Favicon Cache", "favicons.db"],
false
);
let bookmarkTarget = FileUtils.getDir("ULibDir", [
"Safari",
"Bookmarks.plist",
]);
let faviconTarget = FileUtils.getDir("ULibDir", [
"Safari",
"Favicon Cache",
"favicons.db",
]);
try {
// 'stat' is always allowed, but reading is somehow not, if the user hasn't
// allowed it:
@ -624,7 +617,7 @@ export class SafariProfileMigrator extends MigratorBase {
// The title (second arg) is not displayed on macOS, so leave it blank.
fp.init(win, "", Ci.nsIFilePicker.modeGetFolder);
fp.filterIndex = 1;
fp.displayDirectory = FileUtils.getDir("ULibDir", [""], false);
fp.displayDirectory = FileUtils.getDir("ULibDir", [""]);
// Now wait for the filepicker to open and close. If the user picks
// the Safari folder, macOS will grant us read access to everything
// inside, so we don't need to check or do anything else with what's
@ -640,7 +633,7 @@ export class SafariProfileMigrator extends MigratorBase {
get mainPreferencesPropertyList() {
if (this._mainPreferencesPropertyList === undefined) {
let file = FileUtils.getDir("UsrPrfs", [], false);
let file = FileUtils.getDir("UsrPrfs", []);
if (file.exists()) {
file.append("com.apple.Safari.plist");
if (file.exists()) {

2
browser/components/migration/tests/unit/test_MigrationUtils_timedRetry.js
View File

@ -1,6 +1,6 @@
"use strict";
let tmpFile = FileUtils.getDir("TmpD", [], true);
let tmpFile = FileUtils.getDir("TmpD", []);
let dbConn;
add_task(async function setup() {

2
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_DownloadLastDirWithCPS.js
View File

@ -48,7 +48,7 @@ async function runTest() {
"resource://gre/modules/DownloadLastDir.sys.mjs"
);
let tmpDir = FileUtils.getDir("TmpD", [], true);
let tmpDir = FileUtils.getDir("TmpD", []);
let dir1 = newDirectory();
let dir2 = newDirectory();
let dir3 = newDirectory();

2
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir.js
View File

@ -24,7 +24,7 @@ function test() {
let launcherDialog = Cc["@mozilla.org/helperapplauncherdialog;1"].getService(
Ci.nsIHelperAppLauncherDialog
);
let tmpDir = FileUtils.getDir("TmpD", [], true);
let tmpDir = FileUtils.getDir("TmpD", []);
let dir1 = newDirectory();
let dir2 = newDirectory();
let dir3 = newDirectory();

2
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_c.js
View File

@ -19,7 +19,7 @@ function test() {
let validateFileNameToRestore = validateFileName;
let prefs = Services.prefs.getBranch("browser.download.");
let tmpDir = FileUtils.getDir("TmpD", [], true);
let tmpDir = FileUtils.getDir("TmpD", []);
let dir1 = newDirectory();
let dir2 = newDirectory();
let dir3 = newDirectory();

2
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_toggle.js
View File

@ -4,7 +4,7 @@
* on how it behaves when private browsing windows open.
*/
add_task(async function test_downloads_last_dir_toggle() {
let tmpDir = FileUtils.getDir("TmpD", [], true);
let tmpDir = FileUtils.getDir("TmpD", []);
let dir1 = newDirectory();
registerCleanupFunction(function () {

4
browser/components/privatebrowsing/test/browser/head.js
View File

@ -66,9 +66,7 @@ async function openTabAndWaitForRender() {
}
function newDirectory() {
let tmpDir = FileUtils.getDir("TmpD", [], true);
let dir = tmpDir.clone();
dir.append("testdir");
let dir = FileUtils.getDir("TmpD", ["testdir"]);
dir.createUnique(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
return dir;
}

6
browser/modules/test/browser/browser_UnsubmittedCrashHandler.js
View File

@ -26,11 +26,7 @@ const SERVER_URL =
function getPendingCrashReportDir() {
// The fake UAppData directory that makeFakeAppDir provides
// is just UAppData under the profile directory.
return FileUtils.getDir(
"ProfD",
["UAppData", "Crash Reports", "pending"],
false
);
return FileUtils.getDir("ProfD", ["UAppData", "Crash Reports", "pending"]);
}
/**

2
dom/html/test/forms/test_submit_invalid_file.html
View File

@ -37,7 +37,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=702949
var i = document.getElementsByTagName('input')[0];
var file = FileUtils.getDir("TmpD", [], false);
var file = FileUtils.getDir("TmpD", []);
file.append("testfile");
file.createUnique(SpecialPowers.Ci.nsIFile.NORMAL_FILE_TYPE, 0o644);

4
services/common/tests/unit/test_logmanager.js
View File

@ -131,7 +131,7 @@ add_task(async function test_SharedLogs() {
// A little helper to test what log files exist. We expect exactly zero (if
// prefix is null) or exactly one with the specified prefix.
function checkLogFile(prefix) {
let logsdir = FileUtils.getDir("ProfD", ["weave", "logs"], true);
let logsdir = FileUtils.getDir("ProfD", ["weave", "logs"]);
let entries = logsdir.directoryEntries;
if (!prefix) {
// expecting no files.
@ -278,7 +278,7 @@ add_task(async function test_logFileError() {
});
function countLogFiles() {
let logsdir = FileUtils.getDir("ProfD", ["weave", "logs"], true);
let logsdir = FileUtils.getDir("ProfD", ["weave", "logs"]);
let count = 0;
for (let entry of logsdir.directoryEntries) {
void entry;

3
services/sync/tests/unit/test_addons_store.js
View File

@ -46,7 +46,8 @@ Services.prefs.setBoolPref("extensions.experiments.enabled", true);
const SYSTEM_ADDON_ID = "system1@tests.mozilla.org";
add_task(async function setupSystemAddon() {
const distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "app0"], true);
const distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "app0"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
AddonTestUtils.registerDirectory("XREAppFeat", distroDir);
let xpi = await AddonTestUtils.createTempWebExtensionFile({

3
services/sync/tests/unit/test_errorhandler_2.js
View File

@ -22,7 +22,8 @@ registerCleanupFunction(function () {
});
});
const logsdir = FileUtils.getDir("ProfD", ["weave", "logs"], true);
const logsdir = FileUtils.getDir("ProfD", ["weave", "logs"]);
logsdir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
function removeLogFiles() {
let entries = logsdir.directoryEntries;

3
services/sync/tests/unit/test_errorhandler_filelog.js
View File

@ -13,7 +13,8 @@ const { FileUtils } = ChromeUtils.importESModule(
"resource://gre/modules/FileUtils.sys.mjs"
);
const logsdir = FileUtils.getDir("ProfD", ["weave", "logs"], true);
const logsdir = FileUtils.getDir("ProfD", ["weave", "logs"]);
logsdir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
// Delay to wait before cleanup, to allow files to age.
// This is so large because the file timestamp granularity is per-second, and

2
testing/specialpowers/content/MockFilePicker.sys.mjs
View File

@ -93,7 +93,7 @@ export var MockFilePicker = {
},
useAnyFile() {
var file = lazy.FileUtils.getDir("TmpD", [], false);
var file = lazy.FileUtils.getDir("TmpD", []);
file.append("testfile");
file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0o644);
let promise = this.window.File.createFromNsIFile(file)

7
toolkit/components/extensions/test/browser/browser_ext_downloads_filters.js
View File

@ -4,11 +4,8 @@
"use strict";
async function testAppliedFilters(ext, expectedFilter, expectedFilterCount) {
let tempDir = FileUtils.getDir(
"TmpD",
[`testDownloadDir-${Math.random()}`],
true
);
let tempDir = FileUtils.getDir("TmpD", [`testDownloadDir-${Math.random()}`]);
tempDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
let filterCount = 0;

3
toolkit/components/extensions/test/xpcshell/test_ext_clear_cached_resources.js
View File

@ -300,7 +300,8 @@ add_task(
// in XPInstall.jsm).
const random = Math.round(Math.random() * 36 ** 3).toString(36);
const tmpDirName = `xpcshelltest_unpacked_addons_${random}`;
let tmpExtPath = FileUtils.getDir("TmpD", [tmpDirName], true);
let tmpExtPath = FileUtils.getDir("TmpD", [tmpDirName]);
tmpExtPath.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerCleanupFunction(() => {
tmpExtPath.remove(true);
});

2
toolkit/components/telemetry/tests/unit/head.js
View File

@ -291,7 +291,7 @@ async function loadAddonManager(...args) {
// As we're not running in application, we need to setup the features directory
// used by system add-ons.
const distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "app0"], true);
const distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "app0"]);
AddonTestUtils.registerDirectory("XREAppFeat", distroDir);
await AddonTestUtils.overrideBuiltIns({
system: ["tel-system-xpi@tests.mozilla.org"],

3
toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
View File

@ -139,7 +139,8 @@ add_task(async function setup() {
Services.fog.initializeFOG();
// The system add-on must be installed before AddonManager is started.
const distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "app0"], true);
const distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "app0"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
do_get_file("system.xpi").copyTo(
distroDir,
"tel-system-xpi@tests.mozilla.org.xpi"

3
toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment_search.js
View File

@ -33,7 +33,8 @@ add_task(async function setup() {
Services.fog.initializeFOG();
// The system add-on must be installed before AddonManager is started.
const distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "app0"], true);
const distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "app0"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
do_get_file("system.xpi").copyTo(
distroDir,
"tel-system-xpi@tests.mozilla.org.xpi"

6
toolkit/components/thumbnails/test/browser_thumbnails_storage_migrate3.js
View File

@ -21,10 +21,12 @@ var { PageThumbsStorageMigrator } = tmp;
*/
function* runTests() {
// Prepare a local profile directory.
let localProfile = FileUtils.getDir("ProfD", ["local-test"], true);
let localProfile = FileUtils.getDir("ProfD", ["local-test"]);
localProfile.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
changeLocation("ProfLD", localProfile);
let roaming = FileUtils.getDir("ProfD", [THUMBNAIL_DIRECTORY], true);
let roaming = FileUtils.getDir("ProfD", [THUMBNAIL_DIRECTORY]);
roaming.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
// Set up some data in the roaming profile.
let name = PageThumbsStorageService.getLeafNameForURL(URL);

4
toolkit/components/tooltiptext/tests/browser_input_file_tooltips.js
View File

@ -65,7 +65,7 @@ async function do_test(test) {
let MockFilePicker = SpecialPowers.MockFilePicker;
MockFilePicker.init(window);
MockFilePicker.returnValue = MockFilePicker.returnOK;
MockFilePicker.displayDirectory = FileUtils.getDir("TmpD", [], false);
MockFilePicker.displayDirectory = FileUtils.getDir("TmpD", []);
MockFilePicker.setFiles([tempFile]);
MockFilePicker.afterOpenCallback = MockFilePicker.cleanup;
@ -124,7 +124,7 @@ async function do_test(test) {
}
function createTempFile() {
let file = FileUtils.getDir("TmpD", [], false);
let file = FileUtils.getDir("TmpD", []);
file.append("testfile_bug1251809");
file.create(Ci.nsIFile.NORMAL_FILE_TYPE, 0o644);
return file;

6
toolkit/content/tests/browser/browser_save_folder_standalone_image.js
View File

@ -21,9 +21,7 @@ async function setFile(downloadLastDir, aURI, aValue) {
}
function newDirectory() {
let tmpDir = FileUtils.getDir("TmpD", [], true);
let dir = tmpDir.clone();
dir.append("testdir");
let dir = FileUtils.getDir("TmpD", ["testdir"]);
dir.createUnique(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
return dir;
}
@ -52,7 +50,7 @@ add_task(async function () {
"http://mochi.test:8888/browser/toolkit/content/tests/browser/doggy.png";
await BrowserTestUtils.withNewTab(IMAGE_URL, async function (browser) {
let tmpDir = FileUtils.getDir("TmpD", [], true);
let tmpDir = FileUtils.getDir("TmpD", []);
let dir = newDirectory();
let downloadLastDir = new DownloadLastDir(null);
// Set the desired target directory for the IMAGE_URL

3
toolkit/modules/tests/xpcshell/test_FileUtils.js
View File

@ -80,7 +80,8 @@ add_test(function test_getDir_nonexistentDir() {
});
add_test(function test_getDir_shouldCreate() {
let dir = FileUtils.getDir("ProfD", ["c", "d", "foodir"], true);
let dir = FileUtils.getDir("ProfD", ["c", "d", "foodir"]);
dir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
Assert.ok(dir instanceof Ci.nsIFile);
Assert.ok(dir.exists());

5
toolkit/modules/tests/xpcshell/test_GMPInstallManager.js
View File

@ -942,7 +942,7 @@ async function test_checkForAddons_installAddon(
wantInstallReject
);
let httpServer = new HttpServer();
let dir = FileUtils.getDir("TmpD", [], true);
let dir = FileUtils.getDir("TmpD", []);
httpServer.registerDirectory("/", dir);
httpServer.start(-1);
let testserverPort = httpServer.identity.primaryPort;
@ -1184,7 +1184,8 @@ add_task(async function test_GMPExtractor_paths() {
"dummy_gmp.zip"
);
let tempDirName = "TmpDir#猫";
let tempDir = FileUtils.getDir("TmpD", [tempDirName], true);
let tempDir = FileUtils.getDir("TmpD", [tempDirName]);
tempDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
let zipPath = PathUtils.join(tempDir.path, "dummy_gmp.zip");
await IOUtils.copy(srcPath, zipPath);
// The path inside the profile dir we'll extract to. Make sure we handle

31
toolkit/mozapps/extensions/test/xpcshell/head_system_addons.js
View File

@ -132,10 +132,13 @@ function getSystemAddonXPI(num, version) {
}
async function initSystemAddonDirs() {
let hiddenSystemAddonDir = FileUtils.getDir(
"ProfD",
["sysfeatures", "hidden"],
true
let hiddenSystemAddonDir = FileUtils.getDir("ProfD", [
"sysfeatures",
"hidden",
]);
hiddenSystemAddonDir.create(
Ci.nsIFile.DIRECTORY_TYPE,
FileUtils.PERMS_DIRECTORY
);
let system1_1 = await getSystemAddonXPI(1, "1.0");
system1_1.copyTo(hiddenSystemAddonDir, "system1@tests.mozilla.org.xpi");
@ -143,10 +146,13 @@ async function initSystemAddonDirs() {
let system2_1 = await getSystemAddonXPI(2, "1.0");
system2_1.copyTo(hiddenSystemAddonDir, "system2@tests.mozilla.org.xpi");
let prefilledSystemAddonDir = FileUtils.getDir(
"ProfD",
["sysfeatures", "prefilled"],
true
let prefilledSystemAddonDir = FileUtils.getDir("ProfD", [
"sysfeatures",
"prefilled",
]);
prefilledSystemAddonDir.create(
Ci.nsIFile.DIRECTORY_TYPE,
FileUtils.PERMS_DIRECTORY
);
let system2_2 = await getSystemAddonXPI(2, "2.0");
system2_2.copyTo(prefilledSystemAddonDir, "system2@tests.mozilla.org.xpi");
@ -158,7 +164,7 @@ async function initSystemAddonDirs() {
* Returns current system add-on update directory (stored in pref).
*/
function getCurrentSystemAddonUpdatesDir() {
const updatesDir = FileUtils.getDir("ProfD", ["features"], false);
const updatesDir = FileUtils.getDir("ProfD", ["features"]);
let dir = updatesDir.clone();
let set = JSON.parse(Services.prefs.getCharPref(PREF_SYSTEM_ADDON_SET));
dir.append(set.directory);
@ -169,7 +175,7 @@ function getCurrentSystemAddonUpdatesDir() {
* Removes all files from system add-on update directory.
*/
function clearSystemAddonUpdatesDir() {
const updatesDir = FileUtils.getDir("ProfD", ["features"], false);
const updatesDir = FileUtils.getDir("ProfD", ["features"]);
// Delete any existing directories
if (updatesDir.exists()) {
updatesDir.remove(true);
@ -189,7 +195,8 @@ async function buildPrefilledUpdatesDir() {
clearSystemAddonUpdatesDir();
// Build the test set
let dir = FileUtils.getDir("ProfD", ["features", "prefilled"], true);
let dir = FileUtils.getDir("ProfD", ["features", "prefilled"]);
dir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
let xpi = await getSystemAddonXPI(2, "2.0");
xpi.copyTo(dir, "system2@tests.mozilla.org.xpi");
@ -289,7 +296,7 @@ async function checkInstalledSystemAddons(conditions, distroDir) {
* Returns all system add-on updates directories.
*/
async function getSystemAddonDirectories() {
const updatesDir = FileUtils.getDir("ProfD", ["features"], false);
const updatesDir = FileUtils.getDir("ProfD", ["features"]);
let subdirs = [];
if (await IOUtils.exists(updatesDir.path)) {

3
toolkit/mozapps/extensions/test/xpcshell/test_loadManifest_isPrivileged.js
View File

@ -37,7 +37,8 @@ Services.prefs.setIntPref(
// test_builtin_system_location tests the (isSystem && isBuiltin) combination
// (i.e. KEY_APP_SYSTEM_DEFAULTS). That location only exists if this directory
// is found:
const distroDir = FileUtils.getDir("ProfD", ["sysfeatures"], true);
const distroDir = FileUtils.getDir("ProfD", ["sysfeatures"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
function getInstallLocation({

3
toolkit/mozapps/extensions/test/xpcshell/test_nodisable_hidden.js
View File

@ -5,7 +5,8 @@
// This test verifies that hidden add-ons cannot be user disabled.
// for system add-ons
const distroDir = FileUtils.getDir("ProfD", ["sysfeatures"], true);
const distroDir = FileUtils.getDir("ProfD", ["sysfeatures"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
const NORMAL_ID = "normal@tests.mozilla.org";

3
toolkit/mozapps/extensions/test/xpcshell/test_system_allowed.js
View File

@ -5,7 +5,8 @@ createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "0");
// Ensure that only allowed add-ons are loaded.
add_task(async function test_allowed_addons() {
// Build the test set
var distroDir = FileUtils.getDir("ProfD", ["sysfeatures"], true);
var distroDir = FileUtils.getDir("ProfD", ["sysfeatures"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
let xpi = await getSystemAddonXPI(1, "1.0");
xpi.copyTo(distroDir, "system1@tests.mozilla.org.xpi");

3
toolkit/mozapps/extensions/test/xpcshell/test_system_delay_update.js
View File

@ -18,7 +18,8 @@ const DEFER2_ID = "system_delay_defer2@tests.mozilla.org";
const DEFER_ALSO_ID = "system_delay_defer_also@tests.mozilla.org";
const NORMAL_ID = "system1@tests.mozilla.org";
const distroDir = FileUtils.getDir("ProfD", ["sysfeatures"], true);
const distroDir = FileUtils.getDir("ProfD", ["sysfeatures"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
registerCleanupFunction(() => {

3
toolkit/mozapps/extensions/test/xpcshell/test_system_repository.js
View File

@ -10,7 +10,8 @@ createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "0");
// Test with a missing features directory
add_task(async function test_app_addons() {
// Build the test set
var distroDir = FileUtils.getDir("ProfD", ["sysfeatures"], true);
var distroDir = FileUtils.getDir("ProfD", ["sysfeatures"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
let xpi = await getSystemAddonXPI(1, "1.0");
xpi.copyTo(distroDir, "system1@tests.mozilla.org.xpi");

18
toolkit/mozapps/extensions/test/xpcshell/test_system_reset.js
View File

@ -7,21 +7,24 @@ AddonTestUtils.usePrivilegedSignatures = id => "system";
add_task(async function setup() {
// Build the test sets
let dir = FileUtils.getDir("ProfD", ["sysfeatures", "app1"], true);
let dir = FileUtils.getDir("ProfD", ["sysfeatures", "app1"]);
dir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
let xpi = await getSystemAddonXPI(1, "1.0");
xpi.copyTo(dir, "system1@tests.mozilla.org.xpi");
xpi = await getSystemAddonXPI(2, "1.0");
xpi.copyTo(dir, "system2@tests.mozilla.org.xpi");
dir = FileUtils.getDir("ProfD", ["sysfeatures", "app2"], true);
dir = FileUtils.getDir("ProfD", ["sysfeatures", "app2"]);
dir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
xpi = await getSystemAddonXPI(1, "2.0");
xpi.copyTo(dir, "system1@tests.mozilla.org.xpi");
xpi = await getSystemAddonXPI(3, "1.0");
xpi.copyTo(dir, "system3@tests.mozilla.org.xpi");
dir = FileUtils.getDir("ProfD", ["sysfeatures", "app3"], true);
dir = FileUtils.getDir("ProfD", ["sysfeatures", "app3"]);
dir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
xpi = await getSystemAddonXPI(1, "1.0");
xpi.copyTo(dir, "system1@tests.mozilla.org.xpi");
@ -29,7 +32,8 @@ add_task(async function setup() {
xpi.copyTo(dir, "system3@tests.mozilla.org.xpi");
});
const distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "app0"], true);
const distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "app0"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "0");
@ -203,7 +207,8 @@ add_task(async function test_downgrade() {
add_task(async function test_updated() {
// Create a random dir to install into
let dirname = makeUUID();
FileUtils.getDir("ProfD", ["features", dirname], true);
let dir = FileUtils.getDir("ProfD", ["features", dirname]);
dir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
updatesDir.append(dirname);
// Copy in the system add-ons
@ -491,7 +496,8 @@ add_task(async function test_bad_app_cert() {
add_task(async function test_updated_bad_update_set() {
// Create a random dir to install into
let dirname = makeUUID();
FileUtils.getDir("ProfD", ["features", dirname], true);
let dir = FileUtils.getDir("ProfD", ["features", dirname]);
dir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
updatesDir.append(dirname);
// Copy in the system add-ons

3
toolkit/mozapps/extensions/test/xpcshell/test_system_update_blank.js
View File

@ -2,7 +2,8 @@
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2");
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"], true);
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
AddonTestUtils.usePrivilegedSignatures = id => "system";

3
toolkit/mozapps/extensions/test/xpcshell/test_system_update_checkSizeHash.js
View File

@ -2,7 +2,8 @@
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2");
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"], true);
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
AddonTestUtils.usePrivilegedSignatures = id => "system";

3
toolkit/mozapps/extensions/test/xpcshell/test_system_update_custom.js
View File

@ -2,7 +2,8 @@
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2");
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"], true);
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
AddonTestUtils.usePrivilegedSignatures = id => "system";

3
toolkit/mozapps/extensions/test/xpcshell/test_system_update_empty.js
View File

@ -2,7 +2,8 @@
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2");
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"], true);
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
AddonTestUtils.usePrivilegedSignatures = id => "system";

3
toolkit/mozapps/extensions/test/xpcshell/test_system_update_enterprisepolicy.js
View File

@ -13,7 +13,8 @@ Services.policies; // Load policy engine
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2");
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"], true);
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
add_task(() => initSystemAddonDirs());

3
toolkit/mozapps/extensions/test/xpcshell/test_system_update_fail.js
View File

@ -2,7 +2,8 @@
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2");
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"], true);
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
add_task(() => initSystemAddonDirs());

3
toolkit/mozapps/extensions/test/xpcshell/test_system_update_installTelemetryInfo.js
View File

@ -3,7 +3,8 @@
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2");
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"], true);
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
AddonTestUtils.usePrivilegedSignatures = id => "system";

3
toolkit/mozapps/extensions/test/xpcshell/test_system_update_newset.js
View File

@ -2,7 +2,8 @@
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2");
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"], true);
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
AddonTestUtils.usePrivilegedSignatures = id => "system";

3
toolkit/mozapps/extensions/test/xpcshell/test_system_update_overlapping.js
View File

@ -2,7 +2,8 @@
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2");
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"], true);
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
add_task(() => initSystemAddonDirs());

3
toolkit/mozapps/extensions/test/xpcshell/test_system_update_uninstall_check.js
View File

@ -2,7 +2,8 @@
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2");
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"], true);
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
AddonTestUtils.usePrivilegedSignatures = "system";

3
toolkit/mozapps/extensions/test/xpcshell/test_system_update_upgrades.js
View File

@ -2,7 +2,8 @@
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2");
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"], true);
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
AddonTestUtils.usePrivilegedSignatures = id => "system";

10
toolkit/mozapps/extensions/test/xpcshell/test_system_upgrades.js
View File

@ -13,11 +13,11 @@ AddonTestUtils.createAppInfo(
BootstrapMonitor.init();
// A test directory for default/builtin system addons.
const systemDefaults = FileUtils.getDir(
"ProfD",
["app-system-defaults", "features"],
true
);
const systemDefaults = FileUtils.getDir("ProfD", [
"app-system-defaults",
"features",
]);
systemDefaults.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", systemDefaults);
AddonTestUtils.usePrivilegedSignatures = id => "system";

3
toolkit/mozapps/extensions/test/xpcshell/test_systemaddomstartupprefs.js
View File

@ -6,7 +6,8 @@
// are honored during startup/restarts/upgrades.
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2");
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"], true);
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
AddonTestUtils.usePrivilegedSignatures = "system";

3
toolkit/mozapps/extensions/test/xpcshell/test_update_noSystemAddonUpdate.js
View File

@ -2,7 +2,8 @@
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2");
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"], true);
let distroDir = FileUtils.getDir("ProfD", ["sysfeatures", "empty"]);
distroDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
registerDirectory("XREAppFeat", distroDir);
AddonTestUtils.usePrivilegedSignatures = "system";

2
toolkit/mozapps/update/BackgroundUpdate.sys.mjs
View File

@ -550,7 +550,7 @@ export var BackgroundUpdate = {
// put a log file in the specified location. But just to be safe,
// we'll do some cleanup when we re-register the task to make sure
// that no log file is hanging around in the old location.
let oldUpdateDir = lazy.FileUtils.getDir("OldUpdRootD", [], false);
let oldUpdateDir = lazy.FileUtils.getDir("OldUpdRootD", []);
let oldLog = oldUpdateDir.clone();
oldLog.append("backgroundupdate.moz_log");

6
toolkit/mozapps/update/UpdateServiceStub.sys.mjs
View File

@ -60,7 +60,7 @@ function getUpdateBaseDirNoCreate() {
}
}
return FileUtils.getDir(KEY_UPDROOT, [], false);
return FileUtils.getDir(KEY_UPDROOT, []);
}
export function UpdateServiceStub() {
@ -146,8 +146,8 @@ function deactivateUpdateLogFile() {
function migrateUpdateDirectory() {
LOG("UpdateServiceStub:migrateUpdateDirectory Performing migration");
let sourceRootDir = FileUtils.getDir(KEY_OLD_UPDROOT, [], false);
let destRootDir = FileUtils.getDir(KEY_UPDROOT, [], false);
let sourceRootDir = FileUtils.getDir(KEY_OLD_UPDROOT, []);
let destRootDir = FileUtils.getDir(KEY_UPDROOT, []);
let hash = destRootDir.leafName;
if (!sourceRootDir.exists()) {

2
toolkit/mozapps/update/docs/SettingUpAnUpdateServer.rst
View File

@ -190,7 +190,7 @@ update directory:
.. code::
ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs").FileUtils.getDir("UpdRootD", [], false).path
ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs").FileUtils.getDir("UpdRootD", []).path
Once you have determined the update directory, close Firefox, browse to
the directory and remove the subdirectory called ``updates``.

3
toolkit/mozapps/update/tests/marionette/test_no_window_update_restart.py
View File

@ -142,7 +142,8 @@ class TestNoWindowUpdateRestart(MarionetteTestCase):
# skipped, allowing us to look at the update status file directly.
update_status_path = self.marionette.execute_script(
"""
let statusFile = FileUtils.getDir("UpdRootD", ["updates", "0"], true);
let statusFile = FileUtils.getDir("UpdRootD", ["updates", "0"]);
statusFile.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
statusFile.append("update.status");
return statusFile.path;
"""