From b4cf7f93851293c678baf81e595b8f95d80a26d9 Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Tue, 18 Jul 2023 23:06:32 +0000
Subject: [PATCH] Bug 1843790 - Part 4: Rewrite
 toolkit/modules/FileUtils.sys.mjs consumers in html/xhtml to use
 ChromeUtils.importESModule. r=Gijs

Differential Revision: https://phabricator.services.mozilla.com/D183663
---
 devtools/client/webconsole/test/chrome/test_render_perf.html  | 4 +++-
 devtools/shared/webconsole/test/chrome/test_file_uri.html     | 4 +++-
 dom/html/test/forms/test_submit_invalid_file.html             | 4 ++--
 dom/system/tests/ioutils/test_ioutils_mac_xattr.html          | 1 -
 .../test/mochitest/test_chrome_ext_downloads_saveAs.html      | 4 +++-
 .../test/mochitest/test_chrome_ext_downloads_uniquify.html    | 4 +++-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/devtools/client/webconsole/test/chrome/test_render_perf.html b/devtools/client/webconsole/test/chrome/test_render_perf.html
index 8025355a231e..f0c96fe67c44 100644
--- a/devtools/client/webconsole/test/chrome/test_render_perf.html
+++ b/devtools/client/webconsole/test/chrome/test_render_perf.html
@@ -22,7 +22,9 @@
 
 const NUM_MESSAGES = 4000;
 const NUM_STREAMING = 100;
-const {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+const {FileUtils} = ChromeUtils.importESModule(
+  "resource://gre/modules/FileUtils.sys.mjs"
+);
 Services.prefs.setIntPref("devtools.hud.loglimit", NUM_MESSAGES);
 const WebConsoleWrapper = browserRequire("devtools/client/webconsole/webconsole-wrapper");
 const actions =
diff --git a/devtools/shared/webconsole/test/chrome/test_file_uri.html b/devtools/shared/webconsole/test/chrome/test_file_uri.html
index 3a47a98abac4..0a508b6e8a19 100644
--- a/devtools/shared/webconsole/test/chrome/test_file_uri.html
+++ b/devtools/shared/webconsole/test/chrome/test_file_uri.html
@@ -17,7 +17,9 @@
 SimpleTest.waitForExplicitFinish();
 
 const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-const {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+const {FileUtils} = ChromeUtils.importESModule(
+  "resource://gre/modules/FileUtils.sys.mjs"
+);
 
 let gState;
 let gTmpFile;
diff --git a/dom/html/test/forms/test_submit_invalid_file.html b/dom/html/test/forms/test_submit_invalid_file.html
index 6970b031f7b0..68b5e44877eb 100644
--- a/dom/html/test/forms/test_submit_invalid_file.html
+++ b/dom/html/test/forms/test_submit_invalid_file.html
@@ -31,8 +31,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=702949
 
   SimpleTest.waitForExplicitFinish();
   addLoadEvent(function() {
-    var { FileUtils } = SpecialPowers.ChromeUtils.import(
-      "resource://gre/modules/FileUtils.jsm"
+    var { FileUtils } = SpecialPowers.ChromeUtils.importESModule(
+      "resource://gre/modules/FileUtils.sys.mjs"
     );
 
     var i = document.getElementsByTagName('input')[0];
diff --git a/dom/system/tests/ioutils/test_ioutils_mac_xattr.html b/dom/system/tests/ioutils/test_ioutils_mac_xattr.html
index d6580e283bae..6af9b2e6f8da 100644
--- a/dom/system/tests/ioutils/test_ioutils_mac_xattr.html
+++ b/dom/system/tests/ioutils/test_ioutils_mac_xattr.html
@@ -15,7 +15,6 @@
     const { Assert } = ChromeUtils.importESModule(
       "resource://testing-common/Assert.sys.mjs"
     );
-    const { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
 
     const ATTR = "bogus.attr";
     const VALUE = new TextEncoder().encode("bogus");
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_saveAs.html b/toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_saveAs.html
index 64cfcfd289de..4b5d90814ce9 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_saveAs.html
+++ b/toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_saveAs.html
@@ -12,7 +12,9 @@
 <script type="text/javascript">
 "use strict";
 
-const {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+const {FileUtils} = ChromeUtils.importESModule(
+  "resource://gre/modules/FileUtils.sys.mjs"
+);
 
 const PROMPTLESS_DOWNLOAD_PREF = "browser.download.useDownloadDir";
 
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_uniquify.html b/toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_uniquify.html
index b5fedee7ecae..99a6c4850004 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_uniquify.html
+++ b/toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_uniquify.html
@@ -12,7 +12,9 @@
 <script type="text/javascript">
 "use strict";
 
-const {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+const {FileUtils} = ChromeUtils.importESModule(
+  "resource://gre/modules/FileUtils.sys.mjs"
+);
 
 let directory;