Bug 1772742 - Port osfile.jsm usage to IOUtils in uriloader/ r=nika

Differential Revision: https://phabricator.services.mozilla.com/D148445
This commit is contained in:
Barret Rennie 2022-06-30 04:33:05 +00:00
Родитель 2cf65a849a
Коммит 47beac2e67
4 изменённых файлов: 7 добавлений и 8 удалений

Просмотреть файл

@ -44,7 +44,7 @@ add_task(async function skipDialogAndDownloadFile() {
BrowserTestUtils.removeTab(loadingTab);
Assert.ok(
await OS.File.exists(download.target.path),
await IOUtils.exists(download.target.path),
"The file should have been downloaded."
);

Просмотреть файл

@ -61,7 +61,7 @@ async function aDownloadLaunchedWithAppIsSavedInFolder(downloadDir) {
);
Assert.ok(
await OS.File.exists(download.target.path),
await IOUtils.exists(download.target.path),
"The file should not have been deleted."
);

Просмотреть файл

@ -13,7 +13,6 @@ var { AppConstants } = ChromeUtils.import(
);
var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
var { OS, require } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
@ -35,7 +34,7 @@ XPCOMUtils.defineLazyServiceGetter(
do_get_profile();
let jsonPath = OS.Path.join(OS.Constants.Path.profileDir, "handlers.json");
let jsonPath = PathUtils.join(PathUtils.profileDir, "handlers.json");
/**
* Unloads the nsIHandlerService data store, so the back-end file can be
@ -58,7 +57,7 @@ let unloadHandlerStore = async function() {
let deleteHandlerStore = async function() {
await unloadHandlerStore();
await OS.File.remove(jsonPath, { ignoreAbsent: true });
await IOUtils.remove(jsonPath, { ignoreAbsent: true });
Services.prefs.clearUserPref("gecko.handlerService.defaultHandlersVersion");
};
@ -69,7 +68,7 @@ let deleteHandlerStore = async function() {
let copyTestDataToHandlerStore = async function() {
await unloadHandlerStore();
await OS.File.copy(do_get_file("handlers.json").path, jsonPath);
await IOUtils.copy(do_get_file("handlers.json").path, jsonPath);
Services.prefs.setIntPref("gecko.handlerService.defaultHandlersVersion", 100);
};

Просмотреть файл

@ -654,7 +654,7 @@ add_task(async function test_store_keeps_unknown_properties() {
gHandlerService.store(handlerInfo);
await unloadHandlerStore();
let data = JSON.parse(new TextDecoder().decode(await OS.File.read(jsonPath)));
let data = await IOUtils.readJSON(jsonPath);
Assert.equal(
data.mimeTypes["example/type.handleinternally"].unknownProperty,
"preserved"
@ -743,7 +743,7 @@ add_task(async function test_store_gioHandlerApp() {
possibleApplicationHandlers: [expectedGIOMimeHandlerApp, webHandlerApp],
});
await OS.File.remove(dummyHandlerFile.path);
await IOUtils.remove(dummyHandlerFile.path);
// After removing dummyHandlerFile, the handler should disappear from the
// list of possibleApplicationHandlers and preferredAppHandler should be null.