Bug 1745356 - Remove osfile.jsm from browser/components/attribution r…

…=nalexander Differential Revision: https://phabricator.services.mozilla.com/D133840
dothq · Dec 25, 2021 · c7594bb · c7594bb
1 parent 2605c53
commit c7594bb
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/browser/components/attribution/AttributionCode.jsm b/browser/components/attribution/AttributionCode.jsm
@@ -120,17 +120,7 @@ var AttributionCode = {
    */
   async writeAttributionFile(code) {
     let file = AttributionCode.attributionFile;
-    let dir = file.parent;
-    try {
-      // This is a simple way to create the entire directory tree.
-      // `OS.File.makeDir` has an awkward API for our situation.
-      dir.create(Ci.nsIFile.DIRECTORY_TYPE, 0o755);
-    } catch (ex) {
-      if (ex.result != Cr.NS_ERROR_FILE_ALREADY_EXISTS) {
-        throw ex;
-      }
-      // Ignore the exception due to a directory that already exists.
-    }
+    await IOUtils.makeDirectory(file.parent.path);
     let bytes = new TextEncoder().encode(code);
     await AttributionIOUtils.write(file.path, bytes);
   },

diff --git a/browser/components/attribution/test/browser/head.js b/browser/components/attribution/test/browser/head.js
@@ -6,7 +6,6 @@
 const { AttributionCode } = ChromeUtils.import(
   "resource:///modules/AttributionCode.jsm"
 );
-ChromeUtils.defineModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
 
 // Keep in sync with `BROWSER_ATTRIBUTION_ERRORS` in Histograms.json.
 const INDEX_READ_ERROR = 0;

diff --git a/browser/components/attribution/test/xpcshell/test_AttributionCode.js b/browser/components/attribution/test/xpcshell/test_AttributionCode.js
@@ -6,7 +6,6 @@
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
-const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 add_task(async () => {