From e87ecf485e69bf2dd9dd26df900d4d3822bae46a Mon Sep 17 00:00:00 2001 From: Natalia Csoregi Date: Wed, 24 May 2023 04:29:45 +0300 Subject: [PATCH] Backed out 3 changesets (bug 1834222, bug 1834176) for causing RemoteProcessMonitor failures. CLOSED TREE Backed out changeset 346d3a1568dd (bug 1834222) Backed out changeset ea1d8b634bfc (bug 1834176) Backed out changeset 74d1880272d3 (bug 1834176) --- browser/base/content/browser.js | 2 +- .../test/performance/PerfTestHelpers.sys.mjs | 8 ++++--- browser/components/BrowserGlue.sys.mjs | 2 +- browser/components/doh/test/unit/head.js | 4 +--- .../downloads/DownloadsCommon.sys.mjs | 2 +- .../downloads/content/allDownloadsView.js | 2 +- .../components/downloads/content/downloads.js | 6 ++++- .../components/downloads/test/unit/head.js | 6 ++++- .../extensions/test/xpcshell/head.js | 2 +- .../migration/ChromeProfileMigrator.sys.mjs | 6 ++++- .../migration/tests/unit/head_migration.js | 4 +--- .../search/test/unit/test_urlTelemetry.js | 9 +++++++- .../test/unit/test_urlTelemetry_generic.js | 9 +++++++- .../sessionstore/test/coopHeaderCommon.sjs | 4 +--- browser/modules/WindowsPreviewPerTab.jsm | 4 +--- .../configurations/ControlCenter.sys.mjs | 2 +- .../unit/test_create_channel_chrome_url.js | 4 +--- .../shared/remote-debugging/adb/adb-binary.js | 6 ++++- .../remote-debugging/adb/xpcshell/test_adb.js | 4 +--- .../client/styleeditor/StyleEditorUI.sys.mjs | 6 ++++- .../styleeditor/StyleSheetEditor.sys.mjs | 6 ++++- .../actors/network-monitor/network-content.js | 6 ++++- devtools/server/tests/xpcshell/head_dbg.js | 4 +--- devtools/shared/DevToolsUtils.js | 3 +-- ...resources_network_events_parent_process.js | 8 +++---- devtools/shared/layout/utils.js | 8 ++++--- devtools/shared/loader/base-loader.sys.mjs | 8 ++++--- .../shared/loader/loader-plugin-raw.sys.mjs | 2 +- .../network-observer/NetworkHelper.sys.mjs | 4 +++- .../network-observer/NetworkOverride.sys.mjs | 2 +- .../NetworkResponseListener.sys.mjs | 11 +++++++--- .../transport/tests/xpcshell/head_dbg.js | 4 +--- docshell/test/unit/head_docshell.js | 2 +- dom/base/test/unit/head_utilities.js | 4 +--- dom/base/test/unit/test_xhr_document.js | 4 +--- dom/manifest/test/cookie_checker.sjs | 4 +--- dom/manifest/test/file_testserver.sjs | 4 +--- dom/media/IdpSandbox.sys.mjs | 2 +- dom/push/PushServiceHttp2.sys.mjs | 2 +- dom/push/test/xpcshell/head-http2.js | 4 +--- dom/security/test/csp/file_bug888172.sjs | 4 +--- dom/security/test/csp/file_bug910139.sjs | 4 +--- ...unsafe_inline_multiple_policies_server.sjs | 4 +--- .../test/csp/file_report_chromescript.js | 4 +--- dom/security/test/csp/file_testserver.sjs | 4 +--- ...file_upgrade_insecure_reporting_server.sjs | 4 +--- .../test/mixedcontentblocker/file_server.sjs | 4 +--- dom/security/test/unit/test_csp_reports.js | 4 +--- ...est_csp_upgrade_insecure_request_header.js | 4 +--- ...est_https_only_https_first_default_port.js | 4 +--- .../unit/test_https_only_https_first_prefs.js | 4 +--- .../test_isOriginPotentiallyTrustworthy.js | 4 +--- dom/webtransport/test/xpcshell/test_close.js | 4 +--- .../test/xpcshell/test_simple_conn.js | 4 +--- .../test/xpcshell/test_simple_stream.js | 4 +--- dom/xslt/tests/XSLTMark/XSLTMark-static.js | 4 +--- extensions/permissions/test/unit/head.js | 4 +--- image/test/unit/async_load_tests.js | 4 +--- image/test/unit/test_imgtools.js | 4 +--- image/test/unit/test_private_channel.js | 4 +--- intl/uconv/tests/unit/test_bug317216.js | 4 +--- intl/uconv/tests/unit/test_bug340714.js | 4 +--- intl/uconv/tests/unit/test_bug563618.js | 4 +--- intl/uconv/tests/unit/test_utf8_illegals.js | 4 +--- js/xpconnect/tests/chrome/subscript.js | 5 ++--- .../tests/chrome/test_chrometoSource.xhtml | 21 ++++++++---------- .../tests/unit/test_isModuleLoaded.js | 22 ++++++++++--------- js/xpconnect/tests/unit/test_lazyproxy.js | 20 ++++++++--------- .../unit/test_nuke_webextension_wrappers.js | 2 +- .../tests/unit/test_uawidget_scope.js | 2 +- js/xpconnect/tests/unit/test_unload.js | 16 +++++++------- layout/tools/reftest/manifest.jsm | 2 +- modules/libjar/test/unit/test_bug1328865.js | 4 +--- modules/libjar/test/unit/test_bug370103.js | 4 +--- modules/libjar/test/unit/test_bug589292.js | 4 +--- modules/libjar/test/unit/test_bug597702.js | 4 +--- modules/libjar/test/unit/test_bug637286.js | 4 +--- modules/libjar/test/unit/test_bug658093.js | 4 +--- .../test/unit/test_empty_jar_telemetry.js | 4 +--- modules/libjar/test/unit/test_jarchannel.js | 4 +--- modules/libjar/test/unit/test_not_found.js | 4 +--- .../zipwriter/test/unit/test_asyncadd.js | 4 +--- netwerk/base/{NetUtil.sys.mjs => NetUtil.jsm} | 4 +++- netwerk/base/moz.build | 2 +- netwerk/cookie/test/unit/test_bug1155169.js | 4 +--- netwerk/cookie/test/unit/test_bug643051.js | 4 +--- netwerk/cookie/test/unit/test_eviction.js | 4 +--- .../cookie/test/unit/test_getCookieSince.js | 4 +--- netwerk/cookie/test/unit/test_parser_0001.js | 4 +--- netwerk/cookie/test/unit/test_parser_0019.js | 4 +--- netwerk/cookie/test/unit/test_rawSameSite.js | 4 +--- netwerk/cookie/test/unit/test_schemeMap.js | 4 +--- .../browser/cookie_filtering_helper.sys.mjs | 3 +-- netwerk/test/httpserver/test/head_utils.js | 4 +--- netwerk/test/unit/head_cookies.js | 4 +--- netwerk/test/unit_ipc/head_channels_clone.js | 4 +--- netwerk/test/unit_ipc/head_http3_clone.js | 4 +--- netwerk/test/unit_ipc/head_trr_clone.js | 4 +--- remote/cdp/domains/parent/Emulation.sys.mjs | 6 +++-- remote/cdp/observers/NetworkObserver.sys.mjs | 5 ++++- .../pki/resources/content/certManager.js | 4 +--- security/manager/ssl/tests/unit/head_psm.js | 4 +--- security/manager/tools/genRootCAHashes.js | 4 +--- services/common/logmanager.sys.mjs | 6 ++++- services/common/rest.sys.mjs | 3 +-- services/common/tests/unit/head_helpers.js | 4 +--- services/sync/tests/unit/head_helpers.js | 4 +--- .../sync/tps/extensions/tps/resource/tps.jsm | 7 +++++- .../scripts/genHPKPStaticPins.js | 4 +--- testing/mochitest/chrome-harness.js | 4 +--- testing/mochitest/document-builder.sjs | 4 +--- testing/mochitest/server.js | 4 +--- .../content/SpecialPowersChild.sys.mjs | 6 ++++- testing/talos/talos/bootstrap.js | 4 +--- .../talos/talos/pageloader/chrome/Profiler.js | 4 ++-- testing/xpcshell/head.js | 4 ++-- .../{DefaultCLH.sys.mjs => DefaultCLH.jsm} | 4 +++- .../aboutmemory/content/aboutMemory.js | 4 +--- toolkit/components/components.conf | 2 +- .../ContextualIdentityService.sys.mjs | 6 ++++- .../components/downloads/DownloadCore.sys.mjs | 5 ++++- .../downloads/DownloadIntegration.sys.mjs | 6 ++++- .../components/downloads/test/unit/head.js | 2 +- toolkit/components/extensions/Extension.jsm | 2 +- toolkit/components/extensions/Schemas.jsm | 6 ++++- .../test/mochitest/head_unlimitedStorage.js | 4 ++-- .../extensions/test/xpcshell/head.js | 2 +- .../test/unit/test_mediasniffer.js | 4 +--- .../test/unit/test_mediasniffer_ext.js | 4 +--- toolkit/components/moz.build | 2 +- .../mozprotocol/MozProtocolHandler.sys.mjs | 2 +- .../nimbus/test/NimbusTestUtils.sys.mjs | 5 ++++- .../pdfjs/content/PdfStreamConverter.sys.mjs | 6 ++++- .../places/BookmarkHTMLUtils.sys.mjs | 3 +-- toolkit/components/places/Bookmarks.sys.mjs | 6 ++++- .../components/places/tests/head_common.js | 2 +- .../test/unit/test_app_rep.js | 4 +--- .../test/unit/test_app_rep_maclinux.js | 8 ++++--- .../test/unit/test_app_rep_windows.js | 6 ++++- .../test/unit/test_login_rep.js | 4 +--- .../tests/xpcshell/data/searchSuggestions.sjs | 4 +--- .../components/telemetry/tests/unit/head.js | 2 +- .../telemetry/tests/unit/test_CoveragePing.js | 4 +--- .../test/test_thumbnails_interfaces.js | 4 +--- .../UrlClassifierHashCompleter.sys.mjs | 2 +- .../tests/unit/head_urlclassifier.js | 8 ++++--- .../unit/test_channelClassifierService.js | 4 +--- .../tests/unit/test_shouldclassify.js | 4 +--- .../components/utils/SimpleServices.sys.mjs | 8 ++++--- toolkit/content/contentAreaUtils.js | 5 ++++- toolkit/modules/JSONFile.sys.mjs | 6 ++++- .../tests/modules/MockDocument.sys.mjs | 2 +- .../extensions/internal/AddonRepository.jsm | 2 +- .../extensions/internal/AddonTestUtils.jsm | 4 +--- .../extensions/internal/XPIInstall.jsm | 2 +- .../extensions/test/xpcshell/head_addons.js | 4 +--- .../extensions/test/xpinstall/slowinstall.sjs | 4 +--- toolkit/profile/xpcshell/head.js | 4 +--- uriloader/exthandler/tests/unit/head.js | 4 +--- xpcom/tests/unit/test_bug121341.js | 4 +--- 160 files changed, 337 insertions(+), 395 deletions(-) rename netwerk/base/{NetUtil.sys.mjs => NetUtil.jsm} (99%) rename toolkit/components/{DefaultCLH.sys.mjs => DefaultCLH.jsm} (97%) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 28e429c234a3..b2f5062cf967 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -34,7 +34,6 @@ ChromeUtils.defineESModuleGetters(this, { LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs", LoginManagerParent: "resource://gre/modules/LoginManagerParent.sys.mjs", MigrationUtils: "resource:///modules/MigrationUtils.sys.mjs", - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs", NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs", PageThumbs: "resource://gre/modules/PageThumbs.sys.mjs", @@ -91,6 +90,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { CustomizableUI: "resource:///modules/CustomizableUI.jsm", ExtensionsUI: "resource:///modules/ExtensionsUI.jsm", HomePage: "resource:///modules/HomePage.jsm", + NetUtil: "resource://gre/modules/NetUtil.jsm", OpenInTabsUtils: "resource:///modules/OpenInTabsUtils.jsm", PageActions: "resource:///modules/PageActions.jsm", ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm", diff --git a/browser/base/content/test/performance/PerfTestHelpers.sys.mjs b/browser/base/content/test/performance/PerfTestHelpers.sys.mjs index caa832c2e581..075e436331c6 100644 --- a/browser/base/content/test/performance/PerfTestHelpers.sys.mjs +++ b/browser/base/content/test/performance/PerfTestHelpers.sys.mjs @@ -3,9 +3,11 @@ const lazy = {}; -ChromeUtils.defineESModuleGetters(lazy, { - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", -}); +ChromeUtils.defineModuleGetter( + lazy, + "NetUtil", + "resource://gre/modules/NetUtil.jsm" +); export var PerfTestHelpers = { /** diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs index db8c60ccf0ee..2115081c0aba 100644 --- a/browser/components/BrowserGlue.sys.mjs +++ b/browser/components/BrowserGlue.sys.mjs @@ -32,7 +32,6 @@ ChromeUtils.defineESModuleGetters(lazy, { Interactions: "resource:///modules/Interactions.sys.mjs", Log: "resource://gre/modules/Log.sys.mjs", LoginBreaches: "resource:///modules/LoginBreaches.sys.mjs", - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs", NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs", Normandy: "resource://normandy/Normandy.sys.mjs", @@ -89,6 +88,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { Discovery: "resource:///modules/Discovery.jsm", ExtensionsUI: "resource:///modules/ExtensionsUI.jsm", HomePage: "resource:///modules/HomePage.jsm", + NetUtil: "resource://gre/modules/NetUtil.jsm", OnboardingMessageProvider: "resource://activity-stream/lib/OnboardingMessageProvider.jsm", PageActions: "resource:///modules/PageActions.jsm", diff --git a/browser/components/doh/test/unit/head.js b/browser/components/doh/test/unit/head.js index 5c64c867598d..eb19dac8a1f1 100644 --- a/browser/components/doh/test/unit/head.js +++ b/browser/components/doh/test/unit/head.js @@ -4,9 +4,7 @@ "use strict"; -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { PromiseUtils } = ChromeUtils.importESModule( "resource://gre/modules/PromiseUtils.sys.mjs" ); diff --git a/browser/components/downloads/DownloadsCommon.sys.mjs b/browser/components/downloads/DownloadsCommon.sys.mjs index 951e7e8cd9e7..61551c231d95 100644 --- a/browser/components/downloads/DownloadsCommon.sys.mjs +++ b/browser/components/downloads/DownloadsCommon.sys.mjs @@ -34,12 +34,12 @@ ChromeUtils.defineESModuleGetters(lazy, { DownloadHistory: "resource://gre/modules/DownloadHistory.sys.mjs", DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs", Downloads: "resource://gre/modules/Downloads.sys.mjs", - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { + NetUtil: "resource://gre/modules/NetUtil.jsm", BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", }); diff --git a/browser/components/downloads/content/allDownloadsView.js b/browser/components/downloads/content/allDownloadsView.js index 451250c64f8f..9245127b0e05 100644 --- a/browser/components/downloads/content/allDownloadsView.js +++ b/browser/components/downloads/content/allDownloadsView.js @@ -12,12 +12,12 @@ ChromeUtils.defineESModuleGetters(this, { DownloadsCommon: "resource:///modules/DownloadsCommon.sys.mjs", DownloadsViewUI: "resource:///modules/DownloadsViewUI.sys.mjs", FileUtils: "resource://gre/modules/FileUtils.sys.mjs", - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(this, { BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", + NetUtil: "resource://gre/modules/NetUtil.jsm", }); /** diff --git a/browser/components/downloads/content/downloads.js b/browser/components/downloads/content/downloads.js index d3e3ac789756..7cb4a5042cc2 100644 --- a/browser/components/downloads/content/downloads.js +++ b/browser/components/downloads/content/downloads.js @@ -38,9 +38,13 @@ var { XPCOMUtils } = ChromeUtils.importESModule( ChromeUtils.defineESModuleGetters(this, { DownloadsViewUI: "resource:///modules/DownloadsViewUI.sys.mjs", FileUtils: "resource://gre/modules/FileUtils.sys.mjs", - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", }); +ChromeUtils.defineModuleGetter( + this, + "NetUtil", + "resource://gre/modules/NetUtil.jsm" +); const { Integration } = ChromeUtils.importESModule( "resource://gre/modules/Integration.sys.mjs" diff --git a/browser/components/downloads/test/unit/head.js b/browser/components/downloads/test/unit/head.js index b0774a45e213..2f0326e77937 100644 --- a/browser/components/downloads/test/unit/head.js +++ b/browser/components/downloads/test/unit/head.js @@ -3,9 +3,13 @@ ChromeUtils.defineESModuleGetters(this, { DownloadsCommon: "resource:///modules/DownloadsCommon.sys.mjs", FileTestUtils: "resource://testing-common/FileTestUtils.sys.mjs", FileUtils: "resource://gre/modules/FileUtils.sys.mjs", - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", TestUtils: "resource://testing-common/TestUtils.sys.mjs", }); +ChromeUtils.defineModuleGetter( + this, + "NetUtil", + "resource://gre/modules/NetUtil.jsm" +); async function createDownloadedFile(pathname, contents) { info("createDownloadedFile: " + pathname); diff --git a/browser/components/extensions/test/xpcshell/head.js b/browser/components/extensions/test/xpcshell/head.js index 1ae29fb8a0a4..1d5045d3252f 100644 --- a/browser/components/extensions/test/xpcshell/head.js +++ b/browser/components/extensions/test/xpcshell/head.js @@ -12,7 +12,6 @@ const { AppConstants } = ChromeUtils.importESModule( // eslint-disable-next-line no-unused-vars ChromeUtils.defineESModuleGetters(this, { FileUtils: "resource://gre/modules/FileUtils.sys.mjs", - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", TestUtils: "resource://testing-common/TestUtils.sys.mjs", }); @@ -21,6 +20,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { ExtensionData: "resource://gre/modules/Extension.jsm", ExtensionTestUtils: "resource://testing-common/ExtensionXPCShellUtils.jsm", HttpServer: "resource://testing-common/httpd.js", + NetUtil: "resource://gre/modules/NetUtil.jsm", Schemas: "resource://gre/modules/Schemas.jsm", }); diff --git a/browser/components/migration/ChromeProfileMigrator.sys.mjs b/browser/components/migration/ChromeProfileMigrator.sys.mjs index dabff01cb996..c2455db17122 100644 --- a/browser/components/migration/ChromeProfileMigrator.sys.mjs +++ b/browser/components/migration/ChromeProfileMigrator.sys.mjs @@ -10,6 +10,7 @@ const AUTH_TYPE = { SCHEME_DIGEST: 2, }; +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs"; import { MigrationUtils } from "resource:///modules/MigrationUtils.sys.mjs"; import { MigratorBase } from "resource:///modules/MigratorBase.sys.mjs"; @@ -19,11 +20,14 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { ChromeMigrationUtils: "resource:///modules/ChromeMigrationUtils.sys.mjs", FormHistory: "resource://gre/modules/FormHistory.sys.mjs", - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", Qihoo360seMigrationUtils: "resource:///modules/360seMigrationUtils.sys.mjs", }); +XPCOMUtils.defineLazyModuleGetters(lazy, { + NetUtil: "resource://gre/modules/NetUtil.jsm", +}); + /** * Converts an array of chrome bookmark objects into one our own places code * understands. diff --git a/browser/components/migration/tests/unit/head_migration.js b/browser/components/migration/tests/unit/head_migration.js index 6c09f99b4353..7537bb0baf05 100644 --- a/browser/components/migration/tests/unit/head_migration.js +++ b/browser/components/migration/tests/unit/head_migration.js @@ -6,9 +6,7 @@ var { MigrationUtils } = ChromeUtils.importESModule( var { LoginHelper } = ChromeUtils.importESModule( "resource://gre/modules/LoginHelper.sys.mjs" ); -var { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); var { PlacesUtils } = ChromeUtils.importESModule( "resource://gre/modules/PlacesUtils.sys.mjs" ); diff --git a/browser/components/search/test/unit/test_urlTelemetry.js b/browser/components/search/test/unit/test_urlTelemetry.js index abd5a19d66d7..bd46f39e5bc8 100644 --- a/browser/components/search/test/unit/test_urlTelemetry.js +++ b/browser/components/search/test/unit/test_urlTelemetry.js @@ -1,15 +1,22 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ +const { XPCOMUtils } = ChromeUtils.importESModule( + "resource://gre/modules/XPCOMUtils.sys.mjs" +); + ChromeUtils.defineESModuleGetters(this, { BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.sys.mjs", - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs", SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs", TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs", sinon: "resource://testing-common/Sinon.sys.mjs", }); +XPCOMUtils.defineLazyModuleGetters(this, { + NetUtil: "resource://gre/modules/NetUtil.jsm", +}); + const TESTS = [ { title: "Google search access point", diff --git a/browser/components/search/test/unit/test_urlTelemetry_generic.js b/browser/components/search/test/unit/test_urlTelemetry_generic.js index 09ee79ab9fd2..9ef613daaf98 100644 --- a/browser/components/search/test/unit/test_urlTelemetry_generic.js +++ b/browser/components/search/test/unit/test_urlTelemetry_generic.js @@ -1,9 +1,12 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ +const { XPCOMUtils } = ChromeUtils.importESModule( + "resource://gre/modules/XPCOMUtils.sys.mjs" +); + ChromeUtils.defineESModuleGetters(this, { BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.sys.mjs", - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs", SearchSERPTelemetryUtils: "resource:///modules/SearchSERPTelemetry.sys.mjs", SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs", @@ -11,6 +14,10 @@ ChromeUtils.defineESModuleGetters(this, { sinon: "resource://testing-common/Sinon.sys.mjs", }); +XPCOMUtils.defineLazyModuleGetters(this, { + NetUtil: "resource://gre/modules/NetUtil.jsm", +}); + const TEST_PROVIDER_INFO = [ { telemetryId: "example", diff --git a/browser/components/sessionstore/test/coopHeaderCommon.sjs b/browser/components/sessionstore/test/coopHeaderCommon.sjs index 856ed14b45de..5c4801718cef 100644 --- a/browser/components/sessionstore/test/coopHeaderCommon.sjs +++ b/browser/components/sessionstore/test/coopHeaderCommon.sjs @@ -1,8 +1,6 @@ function handleRequest(request, response) { Cu.importGlobalProperties(["URLSearchParams"]); - let { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" - ); + let { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); let query = new URLSearchParams(request.queryString); response.setHeader("Cross-Origin-Opener-Policy", "same-origin", false); diff --git a/browser/modules/WindowsPreviewPerTab.jsm b/browser/modules/WindowsPreviewPerTab.jsm index 446634853427..dc5f4fddba52 100644 --- a/browser/modules/WindowsPreviewPerTab.jsm +++ b/browser/modules/WindowsPreviewPerTab.jsm @@ -43,9 +43,7 @@ */ var EXPORTED_SYMBOLS = ["AeroPeek"]; -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { PlacesUtils } = ChromeUtils.importESModule( "resource://gre/modules/PlacesUtils.sys.mjs" ); diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.sys.mjs index f630fd064bf8..2ada0e831c42 100644 --- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.sys.mjs +++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.sys.mjs @@ -9,7 +9,7 @@ import { UrlClassifierTestUtils } from "resource://testing-common/UrlClassifierT import { SitePermissions } from "resource:///modules/SitePermissions.sys.mjs"; -import { NetUtil } from "resource://gre/modules/NetUtil.sys.mjs"; +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const CC_SELECTORS = ["#identity-popup", "#urlbar-input-container"]; const PP_SELECTORS = ["#protections-popup", "#urlbar-input-container"]; diff --git a/chrome/test/unit/test_create_channel_chrome_url.js b/chrome/test/unit/test_create_channel_chrome_url.js index 2d1c727b3b6f..19c154cba81c 100644 --- a/chrome/test/unit/test_create_channel_chrome_url.js +++ b/chrome/test/unit/test_create_channel_chrome_url.js @@ -4,9 +4,7 @@ "use strict"; -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); function testURL(url) { Services.io.newChannelFromURI( diff --git a/devtools/client/shared/remote-debugging/adb/adb-binary.js b/devtools/client/shared/remote-debugging/adb/adb-binary.js index 447bb5661166..0822b9b43b80 100644 --- a/devtools/client/shared/remote-debugging/adb/adb-binary.js +++ b/devtools/client/shared/remote-debugging/adb/adb-binary.js @@ -15,8 +15,12 @@ ChromeUtils.defineModuleGetter( ); ChromeUtils.defineESModuleGetters(lazy, { FileUtils: "resource://gre/modules/FileUtils.sys.mjs", - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", }); +ChromeUtils.defineModuleGetter( + lazy, + "NetUtil", + "resource://gre/modules/NetUtil.jsm" +); loader.lazyGetter(this, "UNPACKED_ROOT_PATH", () => { return PathUtils.join(PathUtils.localProfileDir, "adb"); }); diff --git a/devtools/client/shared/remote-debugging/adb/xpcshell/test_adb.js b/devtools/client/shared/remote-debugging/adb/xpcshell/test_adb.js index c546712fae9e..a140d805a1d8 100644 --- a/devtools/client/shared/remote-debugging/adb/xpcshell/test_adb.js +++ b/devtools/client/shared/remote-debugging/adb/xpcshell/test_adb.js @@ -6,9 +6,7 @@ const { ExtensionTestUtils } = ChromeUtils.import( "resource://testing-common/ExtensionXPCShellUtils.jsm" ); -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { getFileForBinary, } = require("resource://devtools/client/shared/remote-debugging/adb/adb-binary.js"); diff --git a/devtools/client/styleeditor/StyleEditorUI.sys.mjs b/devtools/client/styleeditor/StyleEditorUI.sys.mjs index 9cca1e86fc25..dc9b8ab3b5e6 100644 --- a/devtools/client/styleeditor/StyleEditorUI.sys.mjs +++ b/devtools/client/styleeditor/StyleEditorUI.sys.mjs @@ -40,8 +40,12 @@ loader.lazyRequireGetter( ChromeUtils.defineESModuleGetters(lazy, { FileUtils: "resource://gre/modules/FileUtils.sys.mjs", - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", }); +ChromeUtils.defineModuleGetter( + lazy, + "NetUtil", + "resource://gre/modules/NetUtil.jsm" +); loader.lazyRequireGetter( lazy, "ResponsiveUIManager", diff --git a/devtools/client/styleeditor/StyleSheetEditor.sys.mjs b/devtools/client/styleeditor/StyleSheetEditor.sys.mjs index c2b981e20439..c863b5b2671b 100644 --- a/devtools/client/styleeditor/StyleSheetEditor.sys.mjs +++ b/devtools/client/styleeditor/StyleSheetEditor.sys.mjs @@ -27,8 +27,12 @@ loader.lazyGetter(lazy, "BufferStream", () => { ChromeUtils.defineESModuleGetters(lazy, { FileUtils: "resource://gre/modules/FileUtils.sys.mjs", - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", }); +ChromeUtils.defineModuleGetter( + lazy, + "NetUtil", + "resource://gre/modules/NetUtil.jsm" +); import { getString, diff --git a/devtools/server/actors/network-monitor/network-content.js b/devtools/server/actors/network-monitor/network-content.js index 8dd339041e00..c292d9da0500 100644 --- a/devtools/server/actors/network-monitor/network-content.js +++ b/devtools/server/actors/network-monitor/network-content.js @@ -10,9 +10,13 @@ const { } = require("resource://devtools/shared/specs/network-content.js"); const lazy = {}; +ChromeUtils.defineModuleGetter( + lazy, + "NetUtil", + "resource://gre/modules/NetUtil.jsm" +); ChromeUtils.defineESModuleGetters(lazy, { - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", NetworkUtils: "resource://devtools/shared/network-observer/NetworkUtils.sys.mjs", }); diff --git a/devtools/server/tests/xpcshell/head_dbg.js b/devtools/server/tests/xpcshell/head_dbg.js index 88499cc05834..84497b011bf1 100644 --- a/devtools/server/tests/xpcshell/head_dbg.js +++ b/devtools/server/tests/xpcshell/head_dbg.js @@ -26,9 +26,7 @@ const { worker } = ChromeUtils.import( "resource://devtools/shared/loader/worker-loader.js" ); -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); // Always log packets when running tests. runxpcshelltests.py will throw // the output away anyway, unless you give it the --verbose flag. diff --git a/devtools/shared/DevToolsUtils.js b/devtools/shared/DevToolsUtils.js index 07db2ac46f15..63bbb87c43c4 100644 --- a/devtools/shared/DevToolsUtils.js +++ b/devtools/shared/DevToolsUtils.js @@ -523,8 +523,7 @@ Object.defineProperty(exports, "assert", { }); DevToolsUtils.defineLazyGetter(this, "NetUtil", () => { - return ChromeUtils.importESModule("resource://gre/modules/NetUtil.sys.mjs") - .NetUtil; + return ChromeUtils.import("resource://gre/modules/NetUtil.jsm").NetUtil; }); /** diff --git a/devtools/shared/commands/resource/tests/browser_resources_network_events_parent_process.js b/devtools/shared/commands/resource/tests/browser_resources_network_events_parent_process.js index c5b3e436db0f..adf1e1ec52e8 100644 --- a/devtools/shared/commands/resource/tests/browser_resources_network_events_parent_process.js +++ b/devtools/shared/commands/resource/tests/browser_resources_network_events_parent_process.js @@ -166,8 +166,8 @@ add_task(async function testParentProcessRequests() { tab.linkedBrowser, [requestUrl], async function (uri) { - const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" + const { NetUtil } = ChromeUtils.import( + "resource://gre/modules/NetUtil.jsm" ); const channel = NetUtil.newChannel({ uri, @@ -198,8 +198,8 @@ add_task(async function testParentProcessRequests() { secondTab.linkedBrowser, [requestUrl], async function (uri) { - const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" + const { NetUtil } = ChromeUtils.import( + "resource://gre/modules/NetUtil.jsm" ); const channel = NetUtil.newChannel({ uri, diff --git a/devtools/shared/layout/utils.js b/devtools/shared/layout/utils.js index 804290654a2c..3e690fc5c36c 100644 --- a/devtools/shared/layout/utils.js +++ b/devtools/shared/layout/utils.js @@ -10,9 +10,11 @@ loader.lazyRequireGetter( "resource://devtools/shared/DevToolsUtils.js" ); const lazy = {}; -ChromeUtils.defineESModuleGetters(lazy, { - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", -}); +ChromeUtils.defineModuleGetter( + lazy, + "NetUtil", + "resource://gre/modules/NetUtil.jsm" +); const SHEET_TYPE = { agent: "AGENT_SHEET", diff --git a/devtools/shared/loader/base-loader.sys.mjs b/devtools/shared/loader/base-loader.sys.mjs index b9d625f3e302..78998d9b7756 100644 --- a/devtools/shared/loader/base-loader.sys.mjs +++ b/devtools/shared/loader/base-loader.sys.mjs @@ -20,9 +20,11 @@ XPCOMUtils.defineLazyServiceGetter( "nsIResProtocolHandler" ); -ChromeUtils.defineESModuleGetters(lazy, { - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", -}); +ChromeUtils.defineModuleGetter( + lazy, + "NetUtil", + "resource://gre/modules/NetUtil.jsm" +); // Define some shortcuts. function* getOwnIdentifiers(x) { diff --git a/devtools/shared/loader/loader-plugin-raw.sys.mjs b/devtools/shared/loader/loader-plugin-raw.sys.mjs index 1e645ad3beef..a7aa630ce5db 100644 --- a/devtools/shared/loader/loader-plugin-raw.sys.mjs +++ b/devtools/shared/loader/loader-plugin-raw.sys.mjs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -import { NetUtil } from "resource://gre/modules/NetUtil.sys.mjs"; +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); /** * A function that can be used as part of a require hook for a diff --git a/devtools/shared/network-observer/NetworkHelper.sys.mjs b/devtools/shared/network-observer/NetworkHelper.sys.mjs index 3014930faf7a..3523c0854ef9 100644 --- a/devtools/shared/network-observer/NetworkHelper.sys.mjs +++ b/devtools/shared/network-observer/NetworkHelper.sys.mjs @@ -67,8 +67,10 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { DevToolsInfaillibleUtils: "resource://devtools/shared/DevToolsInfaillibleUtils.sys.mjs", +}); - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", +XPCOMUtils.defineLazyModuleGetters(lazy, { + NetUtil: "resource://gre/modules/NetUtil.jsm", }); // It would make sense to put this in the above diff --git a/devtools/shared/network-observer/NetworkOverride.sys.mjs b/devtools/shared/network-observer/NetworkOverride.sys.mjs index 1b9ef6c873fe..a7857bcd76c0 100644 --- a/devtools/shared/network-observer/NetworkOverride.sys.mjs +++ b/devtools/shared/network-observer/NetworkOverride.sys.mjs @@ -8,7 +8,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; -import { NetUtil } from "resource://gre/modules/NetUtil.sys.mjs"; +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const lazy = {}; diff --git a/devtools/shared/network-observer/NetworkResponseListener.sys.mjs b/devtools/shared/network-observer/NetworkResponseListener.sys.mjs index 2735882f22c5..23246c73de79 100644 --- a/devtools/shared/network-observer/NetworkResponseListener.sys.mjs +++ b/devtools/shared/network-observer/NetworkResponseListener.sys.mjs @@ -2,16 +2,21 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; + const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", + getResponseCacheObject: + "resource://devtools/shared/platform/CacheEntry.sys.mjs", NetworkHelper: "resource://devtools/shared/network-observer/NetworkHelper.sys.mjs", NetworkUtils: "resource://devtools/shared/network-observer/NetworkUtils.sys.mjs", - getResponseCacheObject: - "resource://devtools/shared/platform/CacheEntry.sys.mjs", +}); + +XPCOMUtils.defineLazyModuleGetters(lazy, { + NetUtil: "resource://gre/modules/NetUtil.jsm", }); // Network logging diff --git a/devtools/shared/transport/tests/xpcshell/head_dbg.js b/devtools/shared/transport/tests/xpcshell/head_dbg.js index 18e235f17e20..42794c771286 100644 --- a/devtools/shared/transport/tests/xpcshell/head_dbg.js +++ b/devtools/shared/transport/tests/xpcshell/head_dbg.js @@ -12,9 +12,7 @@ var CC = Components.Constructor; const { require } = ChromeUtils.importESModule( "resource://devtools/shared/loader/Loader.sys.mjs" ); -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); // We do not want to log packets by default, because in some tests, // we can be sending large amounts of data. The test harness has diff --git a/docshell/test/unit/head_docshell.js b/docshell/test/unit/head_docshell.js index 3999e949c39a..9e2af04b6b94 100644 --- a/docshell/test/unit/head_docshell.js +++ b/docshell/test/unit/head_docshell.js @@ -7,7 +7,6 @@ var { XPCOMUtils } = ChromeUtils.importESModule( ); ChromeUtils.defineESModuleGetters(this, { - NetUtil: "resource://gre/modules/NetUtil.sys.mjs", SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs", SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs", TestUtils: "resource://testing-common/TestUtils.sys.mjs", @@ -16,6 +15,7 @@ ChromeUtils.defineESModuleGetters(this, { XPCOMUtils.defineLazyModuleGetters(this, { AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm", HttpServer: "resource://testing-common/httpd.js", + NetUtil: "resource://gre/modules/NetUtil.jsm", }); var profileDir = do_get_profile(); diff --git a/dom/base/test/unit/head_utilities.js b/dom/base/test/unit/head_utilities.js index cbf0a1b2a71a..4b6d41ff1b33 100644 --- a/dom/base/test/unit/head_utilities.js +++ b/dom/base/test/unit/head_utilities.js @@ -30,9 +30,7 @@ var { HttpError, HttpServer, } = ChromeUtils.import("resource://testing-common/httpd.js"); -var { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const nsIDocumentEncoder = Ci.nsIDocumentEncoder; const replacementChar = diff --git a/dom/base/test/unit/test_xhr_document.js b/dom/base/test/unit/test_xhr_document.js index 94b9f6416bd2..aa96c283c03c 100644 --- a/dom/base/test/unit/test_xhr_document.js +++ b/dom/base/test/unit/test_xhr_document.js @@ -11,9 +11,7 @@ var docbody = ''; function handler(metadata, response) { - var { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" - ); + var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); let body = NetUtil.readInputStreamToString( metadata.bodyInputStream, diff --git a/dom/manifest/test/cookie_checker.sjs b/dom/manifest/test/cookie_checker.sjs index 5405a6207bbe..fa5df00d44ea 100644 --- a/dom/manifest/test/cookie_checker.sjs +++ b/dom/manifest/test/cookie_checker.sjs @@ -1,7 +1,5 @@ "use strict"; -let { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +let { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); function handleRequest(request, response) { response.setStatusLine(request.httpVersion, 200); diff --git a/dom/manifest/test/file_testserver.sjs b/dom/manifest/test/file_testserver.sjs index 93ea9c64a8f3..bcceb1550418 100644 --- a/dom/manifest/test/file_testserver.sjs +++ b/dom/manifest/test/file_testserver.sjs @@ -1,7 +1,5 @@ "use strict"; -let { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +let { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); Cu.importGlobalProperties(["URLSearchParams"]); function loadHTMLFromFile(path) { diff --git a/dom/media/IdpSandbox.sys.mjs b/dom/media/IdpSandbox.sys.mjs index 8b94abf7dd99..bd864b2fabc0 100644 --- a/dom/media/IdpSandbox.sys.mjs +++ b/dom/media/IdpSandbox.sys.mjs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -import { NetUtil } from "resource://gre/modules/NetUtil.sys.mjs"; +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); /** This little class ensures that redirects maintain an https:// origin */ function RedirectHttpsOnly() {} diff --git a/dom/push/PushServiceHttp2.sys.mjs b/dom/push/PushServiceHttp2.sys.mjs index 000b0f7cc238..803f19bcef1a 100644 --- a/dom/push/PushServiceHttp2.sys.mjs +++ b/dom/push/PushServiceHttp2.sys.mjs @@ -6,7 +6,7 @@ import { PushDB } from "resource://gre/modules/PushDB.sys.mjs"; import { PushRecord } from "resource://gre/modules/PushRecord.sys.mjs"; import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; -import { NetUtil } from "resource://gre/modules/NetUtil.sys.mjs"; +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); import { clearTimeout, setTimeout } from "resource://gre/modules/Timer.sys.mjs"; import { PushCrypto } from "resource://gre/modules/PushCrypto.sys.mjs"; diff --git a/dom/push/test/xpcshell/head-http2.js b/dom/push/test/xpcshell/head-http2.js index ef9ec6169025..2538bd3caa7f 100644 --- a/dom/push/test/xpcshell/head-http2.js +++ b/dom/push/test/xpcshell/head-http2.js @@ -1,6 +1,4 @@ -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); // Returns the test H/2 server port, throwing if it's missing or invalid. function getTestServerPort() { diff --git a/dom/security/test/csp/file_bug888172.sjs b/dom/security/test/csp/file_bug888172.sjs index dfce8612898f..adc0f7740cb1 100644 --- a/dom/security/test/csp/file_bug888172.sjs +++ b/dom/security/test/csp/file_bug888172.sjs @@ -1,8 +1,6 @@ // SJS file for CSP mochitests -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); function loadHTMLFromFile(path) { // Load the HTML to return in the response from file. diff --git a/dom/security/test/csp/file_bug910139.sjs b/dom/security/test/csp/file_bug910139.sjs index 7f012ba18030..56647134f80b 100644 --- a/dom/security/test/csp/file_bug910139.sjs +++ b/dom/security/test/csp/file_bug910139.sjs @@ -1,8 +1,6 @@ // Server side js file for bug 910139, see file test_bug910139.html for details. -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); function loadResponseFromFile(path) { var testHTMLFile = Components.classes["@mozilla.org/file/directory_service;1"] diff --git a/dom/security/test/csp/file_ignore_unsafe_inline_multiple_policies_server.sjs b/dom/security/test/csp/file_ignore_unsafe_inline_multiple_policies_server.sjs index 0473ed26b02e..c27aee0f4296 100644 --- a/dom/security/test/csp/file_ignore_unsafe_inline_multiple_policies_server.sjs +++ b/dom/security/test/csp/file_ignore_unsafe_inline_multiple_policies_server.sjs @@ -2,9 +2,7 @@ // * Bug 1004703 - ignore 'unsafe-inline' if nonce- or hash-source specified // * Bug 1198422: should not block inline script if default-src is not specified -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); function loadHTMLFromFile(path) { // Load the HTML to return in the response from file. diff --git a/dom/security/test/csp/file_report_chromescript.js b/dom/security/test/csp/file_report_chromescript.js index b957972dcd4c..56364605dca1 100644 --- a/dom/security/test/csp/file_report_chromescript.js +++ b/dom/security/test/csp/file_report_chromescript.js @@ -1,8 +1,6 @@ /* eslint-env mozilla/chrome-script */ -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); Cu.importGlobalProperties(["TextDecoder"]); diff --git a/dom/security/test/csp/file_testserver.sjs b/dom/security/test/csp/file_testserver.sjs index fab9e000b256..0363fc2c7afb 100644 --- a/dom/security/test/csp/file_testserver.sjs +++ b/dom/security/test/csp/file_testserver.sjs @@ -1,8 +1,6 @@ // SJS file for CSP mochitests "use strict"; -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); Components.utils.importGlobalProperties(["URLSearchParams"]); function loadHTMLFromFile(path) { diff --git a/dom/security/test/csp/file_upgrade_insecure_reporting_server.sjs b/dom/security/test/csp/file_upgrade_insecure_reporting_server.sjs index e83b7238effc..e5ea844bba07 100644 --- a/dom/security/test/csp/file_upgrade_insecure_reporting_server.sjs +++ b/dom/security/test/csp/file_upgrade_insecure_reporting_server.sjs @@ -1,9 +1,7 @@ // Custom *.sjs specifically for the needs of Bug // Bug 1139297 - Implement CSP upgrade-insecure-requests directive -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); // small red image const IMG_BYTES = atob( diff --git a/dom/security/test/mixedcontentblocker/file_server.sjs b/dom/security/test/mixedcontentblocker/file_server.sjs index b5f270fddcb9..3270a4ce1538 100644 --- a/dom/security/test/mixedcontentblocker/file_server.sjs +++ b/dom/security/test/mixedcontentblocker/file_server.sjs @@ -1,6 +1,4 @@ -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); function ERR(response, msg) { dump("ERROR: " + msg + "\n"); diff --git a/dom/security/test/unit/test_csp_reports.js b/dom/security/test/unit/test_csp_reports.js index 7248f1b4117a..5cc9f64eb897 100644 --- a/dom/security/test/unit/test_csp_reports.js +++ b/dom/security/test/unit/test_csp_reports.js @@ -2,9 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); var httpServer = new HttpServer(); diff --git a/dom/security/test/unit/test_csp_upgrade_insecure_request_header.js b/dom/security/test/unit/test_csp_upgrade_insecure_request_header.js index 13400f9c36e7..715ecbc979ca 100644 --- a/dom/security/test/unit/test_csp_upgrade_insecure_request_header.js +++ b/dom/security/test/unit/test_csp_upgrade_insecure_request_header.js @@ -1,7 +1,5 @@ const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); diff --git a/dom/security/test/unit/test_https_only_https_first_default_port.js b/dom/security/test/unit/test_https_only_https_first_default_port.js index f1303f4029c4..8960fd74b00f 100644 --- a/dom/security/test/unit/test_https_only_https_first_default_port.js +++ b/dom/security/test/unit/test_https_only_https_first_default_port.js @@ -1,7 +1,5 @@ const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const TEST_PATH = "/https_only_https_first_port"; var httpserver = null; diff --git a/dom/security/test/unit/test_https_only_https_first_prefs.js b/dom/security/test/unit/test_https_only_https_first_prefs.js index 9848a4ff2668..d3ce4e861563 100644 --- a/dom/security/test/unit/test_https_only_https_first_prefs.js +++ b/dom/security/test/unit/test_https_only_https_first_prefs.js @@ -1,7 +1,5 @@ const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); diff --git a/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js b/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js index acada7e9568d..b218f1438fcd 100644 --- a/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js +++ b/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js @@ -6,9 +6,7 @@ * . */ -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); Services.prefs.setCharPref( "dom.securecontext.allowlist", diff --git a/dom/webtransport/test/xpcshell/test_close.js b/dom/webtransport/test/xpcshell/test_close.js index 53b11599eb05..5c0aa0017cf4 100644 --- a/dom/webtransport/test/xpcshell/test_close.js +++ b/dom/webtransport/test/xpcshell/test_close.js @@ -13,9 +13,7 @@ registerCleanupFunction(async () => { Services.prefs.clearUserPref("network.dns.localDomains"); }); -var { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); function readFile(file) { let fstream = Cc["@mozilla.org/network/file-input-stream;1"].createInstance( diff --git a/dom/webtransport/test/xpcshell/test_simple_conn.js b/dom/webtransport/test/xpcshell/test_simple_conn.js index 8c0c5a3a6651..e5711c0baf41 100644 --- a/dom/webtransport/test/xpcshell/test_simple_conn.js +++ b/dom/webtransport/test/xpcshell/test_simple_conn.js @@ -22,9 +22,7 @@ registerCleanupFunction(async () => { Services.prefs.clearUserPref("network.webtransport.redirect.enabled"); }); -var { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); function readFile(file) { let fstream = Cc["@mozilla.org/network/file-input-stream;1"].createInstance( diff --git a/dom/webtransport/test/xpcshell/test_simple_stream.js b/dom/webtransport/test/xpcshell/test_simple_stream.js index 49fad973a423..4efbfe2539be 100644 --- a/dom/webtransport/test/xpcshell/test_simple_stream.js +++ b/dom/webtransport/test/xpcshell/test_simple_stream.js @@ -21,9 +21,7 @@ registerCleanupFunction(async () => { Services.prefs.clearUserPref("network.webtransport.redirect.enabled"); }); -var { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); function readFile(file) { let fstream = Cc["@mozilla.org/network/file-input-stream;1"].createInstance( diff --git a/dom/xslt/tests/XSLTMark/XSLTMark-static.js b/dom/xslt/tests/XSLTMark/XSLTMark-static.js index 5c1f1ba2f8df..fcca33e72bf1 100644 --- a/dom/xslt/tests/XSLTMark/XSLTMark-static.js +++ b/dom/xslt/tests/XSLTMark/XSLTMark-static.js @@ -12,9 +12,7 @@ const nsIFilePicker = Ci.nsIFilePicker; const STDURLMUT_CTRID = "@mozilla.org/network/standard-url-mutator;1"; const nsIURIMutator = Ci.nsIURIMutator; -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); var gStop = false; diff --git a/extensions/permissions/test/unit/head.js b/extensions/permissions/test/unit/head.js index ae356ca91759..b5b2518e226c 100644 --- a/extensions/permissions/test/unit/head.js +++ b/extensions/permissions/test/unit/head.js @@ -2,9 +2,7 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ -var { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); // Helper to step a generator function and catch a StopIteration exception. function do_run_generator(generator) { diff --git a/image/test/unit/async_load_tests.js b/image/test/unit/async_load_tests.js index 1723f70c474e..06792349eeb0 100644 --- a/image/test/unit/async_load_tests.js +++ b/image/test/unit/async_load_tests.js @@ -8,9 +8,7 @@ /* import-globals-from image_load_helpers.js */ const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const ReferrerInfo = Components.Constructor( "@mozilla.org/referrer-info;1", "nsIReferrerInfo", diff --git a/image/test/unit/test_imgtools.js b/image/test/unit/test_imgtools.js index 689a4ed56f4d..7f832a6b12b3 100644 --- a/image/test/unit/test_imgtools.js +++ b/image/test/unit/test_imgtools.js @@ -2,9 +2,7 @@ * Tests for imgITools */ -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); /* * dumpToFile() diff --git a/image/test/unit/test_private_channel.js b/image/test/unit/test_private_channel.js index a6d981041b9e..008f6aad928c 100644 --- a/image/test/unit/test_private_channel.js +++ b/image/test/unit/test_private_channel.js @@ -1,6 +1,4 @@ -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); const ReferrerInfo = Components.Constructor( diff --git a/intl/uconv/tests/unit/test_bug317216.js b/intl/uconv/tests/unit/test_bug317216.js index cc10ef313e11..2e3e8878acba 100644 --- a/intl/uconv/tests/unit/test_bug317216.js +++ b/intl/uconv/tests/unit/test_bug317216.js @@ -9,9 +9,7 @@ * UTF16 character and mid-surrogate pair */ -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const test = [ // 0: Valid surrogate pair diff --git a/intl/uconv/tests/unit/test_bug340714.js b/intl/uconv/tests/unit/test_bug340714.js index fdd30543f2dd..2475ee5e90fe 100644 --- a/intl/uconv/tests/unit/test_bug340714.js +++ b/intl/uconv/tests/unit/test_bug340714.js @@ -11,9 +11,7 @@ * is an eight-bit character. */ -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const beBOM = "%FE%FF"; const leBOM = "%FF%FE"; diff --git a/intl/uconv/tests/unit/test_bug563618.js b/intl/uconv/tests/unit/test_bug563618.js index f2d8a6e353cc..2fa077034495 100644 --- a/intl/uconv/tests/unit/test_bug563618.js +++ b/intl/uconv/tests/unit/test_bug563618.js @@ -4,9 +4,7 @@ * */ -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const test = [ // 0: 0x8e followed by hi byte, not valid JIS X 0201 diff --git a/intl/uconv/tests/unit/test_utf8_illegals.js b/intl/uconv/tests/unit/test_utf8_illegals.js index 55aec6ab8c86..8712b4c3e82c 100644 --- a/intl/uconv/tests/unit/test_utf8_illegals.js +++ b/intl/uconv/tests/unit/test_utf8_illegals.js @@ -2,9 +2,7 @@ var Cc = Components.Constructor; -const { NetUtil } = ChromeUtils.importESModule( - "resource://gre/modules/NetUtil.sys.mjs" -); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const tests = [ { diff --git a/js/xpconnect/tests/chrome/subscript.js b/js/xpconnect/tests/chrome/subscript.js index c2708f6e9b4f..bcfbccafc9b2 100644 --- a/js/xpconnect/tests/chrome/subscript.js +++ b/js/xpconnect/tests/chrome/subscript.js @@ -1,4 +1,3 @@ -/* global base */ var ns = {}; -Services.scriptloader.loadSubScript(base + "file_expandosharing.jsm", ns); -var checkFromJSM = ns.checkFromJSM; +Services.scriptloader.loadSubScript("resource://gre/modules/NetUtil.jsm", ns); +var NetUtil = ns.NetUtil; diff --git a/js/xpconnect/tests/chrome/test_chrometoSource.xhtml b/js/xpconnect/tests/chrome/test_chrometoSource.xhtml index b9920603a046..843f125b878d 100644 --- a/js/xpconnect/tests/chrome/test_chrometoSource.xhtml +++ b/js/xpconnect/tests/chrome/test_chrometoSource.xhtml @@ -15,8 +15,6 @@