Bug 1658828 - Change OS.File in BrowserUsageTelemetry and test with new IOUtils equivalent r=emalysz

Differential Revision: https://phabricator.services.mozilla.com/D94124

browser/modules/BrowserUsageTelemetry.jsm

@@ -21,7 +21,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   ClientID: "resource://gre/modules/ClientID.jsm",
   BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
   CustomizableUI: "resource:///modules/CustomizableUI.jsm",
-  OS: "resource://gre/modules/osfile.jsm",
   PageActions: "resource:///modules/PageActions.jsm",
   PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
@@ -418,10 +417,9 @@ let BrowserUsageTelemetry = {
   Policy: {
     getTelemetryClientId: async () => ClientID.getClientID(),
     getUpdateDirectory: () => Services.dirsvc.get("UpdRootD", Ci.nsIFile),
-    readProfileCountFile: async path =>
-      OS.File.read(path, { encoding: "UTF-8" }),
+    readProfileCountFile: async path => IOUtils.readUTF8(path),
     writeProfileCountFile: async (path, data) =>
-      OS.File.writeAtomic(path, data),
+      IOUtils.writeAtomicUTF8(path, data),
   },
 
   _inited: false,
@@ -1414,7 +1412,7 @@ let BrowserUsageTelemetry = {
       // always the template that we use when writing to the file for the first
       // time.
       fileData = { version: "1", profileTelemetryIds: [] };
-      if (!(ex instanceof OS.File.Error && ex.becauseNoSuchFile)) {
+      if (!(ex.name == "NotFoundError")) {
         Cu.reportError(ex);
         // Don't just return here on a read error. We need to send the error
         // value to telemetry and we want to attempt to fix the file.

browser/modules/test/unit/test_ProfileCounter.js

@@ -6,7 +6,6 @@
 const { BrowserUsageTelemetry } = ChromeUtils.import(
   "resource:///modules/BrowserUsageTelemetry.jsm"
 );
-const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { TelemetryTestUtils } = ChromeUtils.import(
   "resource://testing-common/TelemetryTestUtils.jsm"
@@ -16,12 +15,9 @@ const PROFILE_COUNT_SCALAR = "browser.engagement.profile_count";
 // Largest possible uint32_t value represents an error.
 const SCALAR_ERROR_VALUE = 0;
 
-// The three constants below are used to construct instances of OS.File.Error
-// that are pretty close to the ones we would really get if a file open failed.
 const FILE_OPEN_OPERATION = "open";
-// These are Windows Error codes returned by GetLastError().
-const ERROR_FILE_NOT_FOUND = 2;
-const ERROR_ACCESS_DENIED = 5;
+const ERROR_FILE_NOT_FOUND = "NotFoundError";
+const ERROR_ACCESS_DENIED = "NotAllowedError";
 
 // We will redirect I/O to/from the profile counter file to read/write this
 // variable instead. That makes it easier for us to:
@@ -37,8 +33,7 @@ var gProfileCounterFilePath = null;
 
 // Storing a value here lets us test the behavior when we encounter an error
 // reading or writing to the file. A null value means that no error will
-// be simulated (other than possibly a FILE_NOT_FOUND error). Otherwise, these
-// should be set to a Windows error code (ex: ERROR_ACCESS_DENIED).
+// be simulated (other than possibly a NotFoundError).
 var gNextReadExceptionReason = null;
 var gNextWriteExceptionReason = null;
 
@@ -116,14 +111,14 @@ function setup() {
     }
     // Strict equality to ensure distinguish properly between null and 0.
     if (gNextReadExceptionReason !== null) {
-      let ex = new OS.File.Error(FILE_OPEN_OPERATION, gNextReadExceptionReason);
+      let ex = new DOMException(FILE_OPEN_OPERATION, gNextReadExceptionReason);
       gNextReadExceptionReason = null;
       throw ex;
     }
     // Strict equality to ensure distinguish properly between a non-existent
     // file and an empty one.
     if (gFakeProfileCounterFile === null) {
-      throw new OS.File.Error(FILE_OPEN_OPERATION, ERROR_FILE_NOT_FOUND);
+      throw new DOMException(FILE_OPEN_OPERATION, ERROR_FILE_NOT_FOUND);
     }
     return gFakeProfileCounterFile;
   };
@@ -141,10 +136,7 @@ function setup() {
     }
     // Strict equality to ensure distinguish properly between null and 0.
     if (gNextWriteExceptionReason !== null) {
-      let ex = new OS.File.Error(
-        FILE_OPEN_OPERATION,
-        gNextWriteExceptionReason
-      );
+      let ex = new DOMException(FILE_OPEN_OPERATION, gNextWriteExceptionReason);
       gNextWriteExceptionReason = null;
       throw ex;
     }