Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1819960 - Convert consumers of netwerk/ to import ES modules directly. r=necko-reviewers,valentin

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D171490
This commit is contained in:
Mark Banner 2023-03-04 11:15:30 +00:00
parent 6c4b226572
commit 30ec141b24
28 changed files with 64 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/components/BrowserGlue.sys.mjs
View File

@ -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",

4
dom/file/tests/test_agentcluster_bloburl.js
View File

@ -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);

4
netwerk/cookie/test/unit/test_bug643051.js
View File

@ -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);

4
netwerk/cookie/test/unit/test_eviction.js
View File

@ -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);

4
netwerk/cookie/test/unit/test_schemeMap.js
View File

@ -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;

4
netwerk/dns/tests/unit/test_PublicSuffixList.js
View File

@ -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"

4
netwerk/test/browser/browser_103_assets.js
View File

@ -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

4
netwerk/test/browser/browser_103_csp.js
View File

@ -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() {

4
netwerk/test/browser/browser_103_csp_styles.js
View File

@ -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() {

4
netwerk/test/browser/browser_103_error.js
View File

@ -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

4
netwerk/test/browser/browser_103_no_cancel_on_error.js
View File

@ -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

4
netwerk/test/browser/browser_103_preload.js
View File

@ -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:

4
netwerk/test/browser/browser_103_preload_2.js
View File

@ -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

7
netwerk/test/browser/browser_103_redirect.js
View File

@ -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

4
netwerk/test/browser/browser_103_user_load.js
View File

@ -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 =

4
netwerk/test/browser/browser_cookie_filtering_basic.js
View File

@ -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

4
netwerk/test/browser/browser_cookie_filtering_cross_origin.js
View File

@ -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) {

4
netwerk/test/browser/browser_cookie_filtering_insecure.js
View File

@ -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) {

4
netwerk/test/browser/browser_cookie_filtering_oa.js
View File

@ -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

4
netwerk/test/browser/browser_cookie_filtering_subdomain.js
View File

@ -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";

4
netwerk/test/unit/head_cookies.js
View File

@ -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.

4
toolkit/components/antitracking/test/xpcshell/test_getPartitionKeyFromURL.js
View File

@ -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);

4
toolkit/components/antitracking/test/xpcshell/test_staticPartition_authhttp.js
View File

@ -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);

4
toolkit/components/antitracking/test/xpcshell/test_staticPartition_font.js
View File

@ -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);

4
toolkit/components/antitracking/test/xpcshell/test_staticPartition_image.js
View File

@ -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);

4
toolkit/components/antitracking/test/xpcshell/test_staticPartition_prefetch.js
View File

@ -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.

4
toolkit/components/antitracking/test/xpcshell/test_staticPartition_preload.js
View File

@ -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;

4
toolkit/components/antitracking/test/xpcshell/test_view_source.js
View File

@ -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);