From 30ec141b244ffac43b5e1d7f5916d0e9bdb6fda3 Mon Sep 17 00:00:00 2001 From: Mark Banner Date: Sat, 4 Mar 2023 11:15:30 +0000 Subject: [PATCH] Bug 1819960 - Convert consumers of netwerk/ to import ES modules directly. r=necko-reviewers,valentin Differential Revision: https://phabricator.services.mozilla.com/D171490 --- browser/components/BrowserGlue.sys.mjs | 3 ++- dom/file/tests/test_agentcluster_bloburl.js | 4 ++-- netwerk/cookie/test/unit/test_bug643051.js | 4 ++-- netwerk/cookie/test/unit/test_eviction.js | 4 ++-- netwerk/cookie/test/unit/test_schemeMap.js | 4 ++-- netwerk/dns/tests/unit/test_PublicSuffixList.js | 4 ++-- netwerk/test/browser/browser_103_assets.js | 4 ++-- netwerk/test/browser/browser_103_csp.js | 4 ++-- netwerk/test/browser/browser_103_csp_styles.js | 4 ++-- netwerk/test/browser/browser_103_error.js | 4 ++-- netwerk/test/browser/browser_103_no_cancel_on_error.js | 4 ++-- netwerk/test/browser/browser_103_preload.js | 4 ++-- netwerk/test/browser/browser_103_preload_2.js | 4 ++-- netwerk/test/browser/browser_103_redirect.js | 7 +++++-- netwerk/test/browser/browser_103_user_load.js | 4 ++-- netwerk/test/browser/browser_cookie_filtering_basic.js | 4 +++- .../test/browser/browser_cookie_filtering_cross_origin.js | 4 +++- netwerk/test/browser/browser_cookie_filtering_insecure.js | 4 +++- netwerk/test/browser/browser_cookie_filtering_oa.js | 4 +++- netwerk/test/browser/browser_cookie_filtering_subdomain.js | 4 +++- netwerk/test/unit/head_cookies.js | 4 ++-- .../test/xpcshell/test_getPartitionKeyFromURL.js | 4 ++-- .../test/xpcshell/test_staticPartition_authhttp.js | 4 ++-- .../test/xpcshell/test_staticPartition_font.js | 4 ++-- .../test/xpcshell/test_staticPartition_image.js | 4 ++-- .../test/xpcshell/test_staticPartition_prefetch.js | 4 ++-- .../test/xpcshell/test_staticPartition_preload.js | 4 ++-- .../antitracking/test/xpcshell/test_view_source.js | 4 ++-- 28 files changed, 64 insertions(+), 50 deletions(-) diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs index fe3be4d04737..3388bfe51438 100644 --- a/browser/components/BrowserGlue.sys.mjs +++ b/browser/components/BrowserGlue.sys.mjs @@ -41,6 +41,8 @@ ChromeUtils.defineESModuleGetters(lazy, { PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", + PublicSuffixList: + "resource://gre/modules/netwerk-dns/PublicSuffixList.sys.mjs", QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs", RemoteSecuritySettings: @@ -93,7 +95,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { PdfJs: "resource://pdf.js/PdfJs.jsm", PluralForm: "resource://gre/modules/PluralForm.jsm", ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm", - PublicSuffixList: "resource://gre/modules/netwerk-dns/PublicSuffixList.jsm", RFPHelper: "resource://gre/modules/RFPHelper.jsm", SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm", Sanitizer: "resource:///modules/Sanitizer.jsm", diff --git a/dom/file/tests/test_agentcluster_bloburl.js b/dom/file/tests/test_agentcluster_bloburl.js index eb6377674f24..2a577116a20f 100644 --- a/dom/file/tests/test_agentcluster_bloburl.js +++ b/dom/file/tests/test_agentcluster_bloburl.js @@ -2,8 +2,8 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ -const { CookieXPCShellUtils } = ChromeUtils.import( - "resource://testing-common/CookieXPCShellUtils.jsm" +const { CookieXPCShellUtils } = ChromeUtils.importESModule( + "resource://testing-common/CookieXPCShellUtils.sys.mjs" ); CookieXPCShellUtils.init(this); diff --git a/netwerk/cookie/test/unit/test_bug643051.js b/netwerk/cookie/test/unit/test_bug643051.js index c95f9e589ef9..d06f37587765 100644 --- a/netwerk/cookie/test/unit/test_bug643051.js +++ b/netwerk/cookie/test/unit/test_bug643051.js @@ -1,6 +1,6 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { CookieXPCShellUtils } = ChromeUtils.import( - "resource://testing-common/CookieXPCShellUtils.jsm" +const { CookieXPCShellUtils } = ChromeUtils.importESModule( + "resource://testing-common/CookieXPCShellUtils.sys.mjs" ); CookieXPCShellUtils.init(this); diff --git a/netwerk/cookie/test/unit/test_eviction.js b/netwerk/cookie/test/unit/test_eviction.js index c64a982c01cd..a2e0e29801a4 100644 --- a/netwerk/cookie/test/unit/test_eviction.js +++ b/netwerk/cookie/test/unit/test_eviction.js @@ -2,8 +2,8 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const BASE_HOST = "example.org"; -const { CookieXPCShellUtils } = ChromeUtils.import( - "resource://testing-common/CookieXPCShellUtils.jsm" +const { CookieXPCShellUtils } = ChromeUtils.importESModule( + "resource://testing-common/CookieXPCShellUtils.sys.mjs" ); CookieXPCShellUtils.init(this); diff --git a/netwerk/cookie/test/unit/test_schemeMap.js b/netwerk/cookie/test/unit/test_schemeMap.js index 249fb25b97dc..8802fd7e1f0b 100644 --- a/netwerk/cookie/test/unit/test_schemeMap.js +++ b/netwerk/cookie/test/unit/test_schemeMap.js @@ -4,8 +4,8 @@ function inChildProcess() { return Services.appinfo.processType != Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT; } -const { CookieXPCShellUtils } = ChromeUtils.import( - "resource://testing-common/CookieXPCShellUtils.jsm" +const { CookieXPCShellUtils } = ChromeUtils.importESModule( + "resource://testing-common/CookieXPCShellUtils.sys.mjs" ); let CookieXPCShellUtilsInitialized = false; diff --git a/netwerk/dns/tests/unit/test_PublicSuffixList.js b/netwerk/dns/tests/unit/test_PublicSuffixList.js index 21fb383550ce..ad61abea8e59 100644 --- a/netwerk/dns/tests/unit/test_PublicSuffixList.js +++ b/netwerk/dns/tests/unit/test_PublicSuffixList.js @@ -3,8 +3,8 @@ "use strict"; -const { PublicSuffixList } = ChromeUtils.import( - "resource://gre/modules/netwerk-dns/PublicSuffixList.jsm" +const { PublicSuffixList } = ChromeUtils.importESModule( + "resource://gre/modules/netwerk-dns/PublicSuffixList.sys.mjs" ); const { TestUtils } = ChromeUtils.importESModule( "resource://testing-common/TestUtils.sys.mjs" diff --git a/netwerk/test/browser/browser_103_assets.js b/netwerk/test/browser/browser_103_assets.js index 46e6b6ee48a0..908cb3b6476c 100644 --- a/netwerk/test/browser/browser_103_assets.js +++ b/netwerk/test/browser/browser_103_assets.js @@ -4,8 +4,8 @@ Services.prefs.setBoolPref("network.early-hints.enabled", true); -const { request_count_checking } = ChromeUtils.import( - "resource://testing-common/early_hint_preload_test_helper.jsm" +const { request_count_checking } = ChromeUtils.importESModule( + "resource://testing-common/early_hint_preload_test_helper.sys.mjs" ); // - testName is just there to be printed during Asserts when failing diff --git a/netwerk/test/browser/browser_103_csp.js b/netwerk/test/browser/browser_103_csp.js index 80a3b4b0b31c..1786bac454c1 100644 --- a/netwerk/test/browser/browser_103_csp.js +++ b/netwerk/test/browser/browser_103_csp.js @@ -6,8 +6,8 @@ Services.prefs.setBoolPref("network.early-hints.enabled", true); -const { test_preload_hint_and_request } = ChromeUtils.import( - "resource://testing-common/early_hint_preload_test_helper.jsm" +const { test_preload_hint_and_request } = ChromeUtils.importESModule( + "resource://testing-common/early_hint_preload_test_helper.sys.mjs" ); add_task(async function test_preload_images_csp_in_early_hints_response() { diff --git a/netwerk/test/browser/browser_103_csp_styles.js b/netwerk/test/browser/browser_103_csp_styles.js index 9ac48d94d576..59c2fc14be54 100644 --- a/netwerk/test/browser/browser_103_csp_styles.js +++ b/netwerk/test/browser/browser_103_csp_styles.js @@ -6,8 +6,8 @@ Services.prefs.setBoolPref("network.early-hints.enabled", true); -const { test_preload_hint_and_request } = ChromeUtils.import( - "resource://testing-common/early_hint_preload_test_helper.jsm" +const { test_preload_hint_and_request } = ChromeUtils.importESModule( + "resource://testing-common/early_hint_preload_test_helper.sys.mjs" ); add_task(async function test_preload_styles_csp_in_response() { diff --git a/netwerk/test/browser/browser_103_error.js b/netwerk/test/browser/browser_103_error.js index 6a98872c9403..a7a447aa7e59 100644 --- a/netwerk/test/browser/browser_103_error.js +++ b/netwerk/test/browser/browser_103_error.js @@ -6,8 +6,8 @@ Services.prefs.setBoolPref("network.early-hints.enabled", true); -const { test_hint_preload } = ChromeUtils.import( - "resource://testing-common/early_hint_preload_test_helper.jsm" +const { test_hint_preload } = ChromeUtils.importESModule( + "resource://testing-common/early_hint_preload_test_helper.sys.mjs" ); // 400 Bad Request diff --git a/netwerk/test/browser/browser_103_no_cancel_on_error.js b/netwerk/test/browser/browser_103_no_cancel_on_error.js index 537dda8ed4fb..632fe15b2bfa 100644 --- a/netwerk/test/browser/browser_103_no_cancel_on_error.js +++ b/netwerk/test/browser/browser_103_no_cancel_on_error.js @@ -8,8 +8,8 @@ Services.prefs.setBoolPref("network.early-hints.enabled", true); -const { request_count_checking } = ChromeUtils.import( - "resource://testing-common/early_hint_preload_test_helper.jsm" +const { request_count_checking } = ChromeUtils.importESModule( + "resource://testing-common/early_hint_preload_test_helper.sys.mjs" ); // - httpCode is the response code we're testing for. This file mostly covers 400 and 500 responses diff --git a/netwerk/test/browser/browser_103_preload.js b/netwerk/test/browser/browser_103_preload.js index e995b7f36185..38bf7bffbe47 100644 --- a/netwerk/test/browser/browser_103_preload.js +++ b/netwerk/test/browser/browser_103_preload.js @@ -15,8 +15,8 @@ const { request_count_checking, test_hint_preload_internal, test_hint_preload, -} = ChromeUtils.import( - "resource://testing-common/early_hint_preload_test_helper.jsm" +} = ChromeUtils.importESModule( + "resource://testing-common/early_hint_preload_test_helper.sys.mjs" ); // TODO testing: diff --git a/netwerk/test/browser/browser_103_preload_2.js b/netwerk/test/browser/browser_103_preload_2.js index 57b350f38ed3..895bf7014f0d 100644 --- a/netwerk/test/browser/browser_103_preload_2.js +++ b/netwerk/test/browser/browser_103_preload_2.js @@ -10,8 +10,8 @@ const { test_hint_preload, test_hint_preload_internal, request_count_checking, -} = ChromeUtils.import( - "resource://testing-common/early_hint_preload_test_helper.jsm" +} = ChromeUtils.importESModule( + "resource://testing-common/early_hint_preload_test_helper.sys.mjs" ); // two early hint responses diff --git a/netwerk/test/browser/browser_103_redirect.js b/netwerk/test/browser/browser_103_redirect.js index 5eb208f7b8a6..d84cfe88d8a4 100644 --- a/netwerk/test/browser/browser_103_redirect.js +++ b/netwerk/test/browser/browser_103_redirect.js @@ -6,8 +6,11 @@ Services.prefs.setBoolPref("network.early-hints.enabled", true); -const { test_hint_preload, request_count_checking } = ChromeUtils.import( - "resource://testing-common/early_hint_preload_test_helper.jsm" +const { + test_hint_preload, + request_count_checking, +} = ChromeUtils.importESModule( + "resource://testing-common/early_hint_preload_test_helper.sys.mjs" ); // Early hint to redirect to same origin in secure context diff --git a/netwerk/test/browser/browser_103_user_load.js b/netwerk/test/browser/browser_103_user_load.js index 332da530647e..1db5b49acf2e 100644 --- a/netwerk/test/browser/browser_103_user_load.js +++ b/netwerk/test/browser/browser_103_user_load.js @@ -11,8 +11,8 @@ const { request_count_checking, test_hint_preload_internal, test_hint_preload, -} = ChromeUtils.import( - "resource://testing-common/early_hint_preload_test_helper.jsm" +} = ChromeUtils.importESModule( + "resource://testing-common/early_hint_preload_test_helper.sys.mjs" ); const START_VALUE = diff --git a/netwerk/test/browser/browser_cookie_filtering_basic.js b/netwerk/test/browser/browser_cookie_filtering_basic.js index 28ad20cb3107..45693f0969b2 100644 --- a/netwerk/test/browser/browser_cookie_filtering_basic.js +++ b/netwerk/test/browser/browser_cookie_filtering_basic.js @@ -16,7 +16,9 @@ const { fetchHelper, preclean_test, cleanup_test, -} = ChromeUtils.import("resource://testing-common/cookie_filtering_helper.jsm"); +} = ChromeUtils.importESModule( + "resource://testing-common/cookie_filtering_helper.sys.mjs" +); // run suite with content listener // 1. initializes the content process and observer diff --git a/netwerk/test/browser/browser_cookie_filtering_cross_origin.js b/netwerk/test/browser/browser_cookie_filtering_cross_origin.js index b34d6942d965..0d518a33f23c 100644 --- a/netwerk/test/browser/browser_cookie_filtering_cross_origin.js +++ b/netwerk/test/browser/browser_cookie_filtering_cross_origin.js @@ -14,7 +14,9 @@ const { checkExpectedCookies, preclean_test, cleanup_test, -} = ChromeUtils.import("resource://testing-common/cookie_filtering_helper.jsm"); +} = ChromeUtils.importESModule( + "resource://testing-common/cookie_filtering_helper.sys.mjs" +); async function runSuiteWithContentListener(name, trigger_suite_func, expected) { return async function(browser) { diff --git a/netwerk/test/browser/browser_cookie_filtering_insecure.js b/netwerk/test/browser/browser_cookie_filtering_insecure.js index 13561b48c9ce..3717101b3cb1 100644 --- a/netwerk/test/browser/browser_cookie_filtering_insecure.js +++ b/netwerk/test/browser/browser_cookie_filtering_insecure.js @@ -15,7 +15,9 @@ const { fetchHelper, preclean_test, cleanup_test, -} = ChromeUtils.import("resource://testing-common/cookie_filtering_helper.jsm"); +} = ChromeUtils.importESModule( + "resource://testing-common/cookie_filtering_helper.sys.mjs" +); async function runSuiteWithContentListener(name, trigger_suite_func, expected) { return async function(browser) { diff --git a/netwerk/test/browser/browser_cookie_filtering_oa.js b/netwerk/test/browser/browser_cookie_filtering_oa.js index a3142ed73cd2..a1f4bbb2192a 100644 --- a/netwerk/test/browser/browser_cookie_filtering_oa.js +++ b/netwerk/test/browser/browser_cookie_filtering_oa.js @@ -17,7 +17,9 @@ const { triggerSetCookieFromHttpPrivate, preclean_test, cleanup_test, -} = ChromeUtils.import("resource://testing-common/cookie_filtering_helper.jsm"); +} = ChromeUtils.importESModule( + "resource://testing-common/cookie_filtering_helper.sys.mjs" +); // TEST: OriginAttributes // * example.com OA-changed cookies don't go to example.com & vice-versa diff --git a/netwerk/test/browser/browser_cookie_filtering_subdomain.js b/netwerk/test/browser/browser_cookie_filtering_subdomain.js index 5be46973b27e..612f27284992 100644 --- a/netwerk/test/browser/browser_cookie_filtering_subdomain.js +++ b/netwerk/test/browser/browser_cookie_filtering_subdomain.js @@ -16,7 +16,9 @@ const { fetchHelper, preclean_test, cleanup_test, -} = ChromeUtils.import("resource://testing-common/cookie_filtering_helper.jsm"); +} = ChromeUtils.importESModule( + "resource://testing-common/cookie_filtering_helper.sys.mjs" +); const HTTPS_SUBDOMAIN_1_EXAMPLE_COM = "https://test1.example.com"; const HTTP_SUBDOMAIN_1_EXAMPLE_COM = "http://test1.example.com"; diff --git a/netwerk/test/unit/head_cookies.js b/netwerk/test/unit/head_cookies.js index 052475b59ef4..ec60f68963a1 100644 --- a/netwerk/test/unit/head_cookies.js +++ b/netwerk/test/unit/head_cookies.js @@ -7,8 +7,8 @@ "use strict"; const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { CookieXPCShellUtils } = ChromeUtils.import( - "resource://testing-common/CookieXPCShellUtils.jsm" +const { CookieXPCShellUtils } = ChromeUtils.importESModule( + "resource://testing-common/CookieXPCShellUtils.sys.mjs" ); // Don't pick up default permissions from profile. diff --git a/toolkit/components/antitracking/test/xpcshell/test_getPartitionKeyFromURL.js b/toolkit/components/antitracking/test/xpcshell/test_getPartitionKeyFromURL.js index 256033f84d2e..5ced9eeb9293 100644 --- a/toolkit/components/antitracking/test/xpcshell/test_getPartitionKeyFromURL.js +++ b/toolkit/components/antitracking/test/xpcshell/test_getPartitionKeyFromURL.js @@ -3,8 +3,8 @@ "use strict"; -const { CookieXPCShellUtils } = ChromeUtils.import( - "resource://testing-common/CookieXPCShellUtils.jsm" +const { CookieXPCShellUtils } = ChromeUtils.importESModule( + "resource://testing-common/CookieXPCShellUtils.sys.mjs" ); CookieXPCShellUtils.init(this); diff --git a/toolkit/components/antitracking/test/xpcshell/test_staticPartition_authhttp.js b/toolkit/components/antitracking/test/xpcshell/test_staticPartition_authhttp.js index 09e17cf8de9a..0492f5ff2a96 100644 --- a/toolkit/components/antitracking/test/xpcshell/test_staticPartition_authhttp.js +++ b/toolkit/components/antitracking/test/xpcshell/test_staticPartition_authhttp.js @@ -4,8 +4,8 @@ "use strict"; -const { CookieXPCShellUtils } = ChromeUtils.import( - "resource://testing-common/CookieXPCShellUtils.jsm" +const { CookieXPCShellUtils } = ChromeUtils.importESModule( + "resource://testing-common/CookieXPCShellUtils.sys.mjs" ); CookieXPCShellUtils.init(this); diff --git a/toolkit/components/antitracking/test/xpcshell/test_staticPartition_font.js b/toolkit/components/antitracking/test/xpcshell/test_staticPartition_font.js index 721f50e7dcf2..4c28165230e2 100644 --- a/toolkit/components/antitracking/test/xpcshell/test_staticPartition_font.js +++ b/toolkit/components/antitracking/test/xpcshell/test_staticPartition_font.js @@ -2,8 +2,8 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ -const { CookieXPCShellUtils } = ChromeUtils.import( - "resource://testing-common/CookieXPCShellUtils.jsm" +const { CookieXPCShellUtils } = ChromeUtils.importESModule( + "resource://testing-common/CookieXPCShellUtils.sys.mjs" ); CookieXPCShellUtils.init(this); diff --git a/toolkit/components/antitracking/test/xpcshell/test_staticPartition_image.js b/toolkit/components/antitracking/test/xpcshell/test_staticPartition_image.js index c8a8238cc2a1..09a1ff0a92e2 100644 --- a/toolkit/components/antitracking/test/xpcshell/test_staticPartition_image.js +++ b/toolkit/components/antitracking/test/xpcshell/test_staticPartition_image.js @@ -2,8 +2,8 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ -const { CookieXPCShellUtils } = ChromeUtils.import( - "resource://testing-common/CookieXPCShellUtils.jsm" +const { CookieXPCShellUtils } = ChromeUtils.importESModule( + "resource://testing-common/CookieXPCShellUtils.sys.mjs" ); CookieXPCShellUtils.init(this); diff --git a/toolkit/components/antitracking/test/xpcshell/test_staticPartition_prefetch.js b/toolkit/components/antitracking/test/xpcshell/test_staticPartition_prefetch.js index 58fd164d95f5..1215ec2384db 100644 --- a/toolkit/components/antitracking/test/xpcshell/test_staticPartition_prefetch.js +++ b/toolkit/components/antitracking/test/xpcshell/test_staticPartition_prefetch.js @@ -4,8 +4,8 @@ "use strict"; -const { CookieXPCShellUtils } = ChromeUtils.import( - "resource://testing-common/CookieXPCShellUtils.jsm" +const { CookieXPCShellUtils } = ChromeUtils.importESModule( + "resource://testing-common/CookieXPCShellUtils.sys.mjs" ); // Small red image. diff --git a/toolkit/components/antitracking/test/xpcshell/test_staticPartition_preload.js b/toolkit/components/antitracking/test/xpcshell/test_staticPartition_preload.js index 4e137a84452c..cee999e00449 100644 --- a/toolkit/components/antitracking/test/xpcshell/test_staticPartition_preload.js +++ b/toolkit/components/antitracking/test/xpcshell/test_staticPartition_preload.js @@ -4,8 +4,8 @@ "use strict"; -const { CookieXPCShellUtils } = ChromeUtils.import( - "resource://testing-common/CookieXPCShellUtils.jsm" +const { CookieXPCShellUtils } = ChromeUtils.importESModule( + "resource://testing-common/CookieXPCShellUtils.sys.mjs" ); let gHints = 0; diff --git a/toolkit/components/antitracking/test/xpcshell/test_view_source.js b/toolkit/components/antitracking/test/xpcshell/test_view_source.js index 6266a287f696..ab888563746f 100644 --- a/toolkit/components/antitracking/test/xpcshell/test_view_source.js +++ b/toolkit/components/antitracking/test/xpcshell/test_view_source.js @@ -2,8 +2,8 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ -const { CookieXPCShellUtils } = ChromeUtils.import( - "resource://testing-common/CookieXPCShellUtils.jsm" +const { CookieXPCShellUtils } = ChromeUtils.importESModule( + "resource://testing-common/CookieXPCShellUtils.sys.mjs" ); CookieXPCShellUtils.init(this);