From 8a35d5cf5f61752108418fff8b4b70334dac148d Mon Sep 17 00:00:00 2001 From: Gregory Pappas Date: Tue, 1 Aug 2023 23:01:02 +0000 Subject: [PATCH] Bug 1845311 - [Part 2] Use ChromeUtils.defineLazyGetter in more places r=arai,webcompat-reviewers,necko-reviewers,extension-reviewers,settings-reviewers,application-update-reviewers,credential-management-reviewers,devtools-reviewers,fxview-reviewers,sync-reviewers,anti-tracking-reviewers,tabbrowser-reviewers,bytesized,twisniewski,sgalich,mak,kershaw,sclements,pbz,robwu,geckoview-reviewers,amejiamarmol Differential Revision: https://phabricator.services.mozilla.com/D184623 --- browser/base/content/browser-addons.js | 2 +- .../content/browser-fullScreenAndPointerLock.js | 2 +- browser/base/content/browser-siteProtections.js | 43 +++++---- browser/base/content/browser-thumbnails.js | 8 +- browser/base/content/browser.js | 28 +++--- browser/base/content/tabbrowser.js | 2 +- .../base/content/test/popupNotifications/head.js | 2 +- browser/base/content/test/protectionsUI/head.js | 2 +- browser/base/content/test/webextensions/head.js | 2 +- browser/base/content/utilityOverlay.js | 2 +- .../test/browser_proton_moreTools_panel.js | 2 +- browser/components/downloads/content/downloads.js | 6 +- .../components/extensions/parent/ext-bookmarks.js | 6 +- .../components/extensions/parent/ext-browser.js | 2 +- .../extensions/parent/ext-browserAction.js | 2 +- .../parent/ext-chrome-settings-overrides.js | 2 +- browser/components/extensions/parent/ext-tabs.js | 4 +- .../extensions/parent/ext-url-overrides.js | 2 +- .../extensions/test/browser/head_devtools.js | 2 +- browser/components/firefoxview/fxview-tab-list.mjs | 2 +- browser/components/firefoxview/helpers.mjs | 7 +- browser/components/places/content/controller.js | 2 +- browser/components/places/content/editBookmark.js | 4 +- browser/components/places/tests/browser/head.js | 2 +- browser/components/preferences/main.js | 2 +- browser/components/preferences/preferences.js | 2 +- browser/components/preferences/privacy.js | 2 +- .../preferences/tests/browser_primaryPassword.js | 2 +- .../tests/browser_privacy_firefoxSuggest.js | 2 +- .../tests/browser_search_searchTerms.js | 2 +- .../test/browser/browser_privatebrowsing_about.js | 2 +- .../test/browser/browser_protections_report_ui.js | 2 +- .../browser_screenshots_test_toggle_pref.js | 2 +- .../search/test/browser/telemetry/head.js | 4 +- browser/components/uitour/test/browser_fxa.js | 2 +- .../components/urlbar/tests/browser-tips/head.js | 4 +- .../urlbar/tests/browser-updateResults/head.js | 2 +- .../urlbar/tests/browser/browser_oneOffs.js | 2 +- .../tests/browser/browser_oneOffs_contextMenu.js | 2 +- .../browser/browser_oneOffs_heuristicRestyle.js | 2 +- .../tests/browser/browser_oneOffs_keyModifiers.js | 2 +- .../components/urlbar/tests/browser/head-common.js | 6 +- browser/components/urlbar/tests/browser/head.js | 2 +- .../tests/engagementTelemetry/browser/head.js | 4 +- browser/components/urlbar/tests/ext/api.js | 2 +- .../urlbar/tests/quicksuggest/browser/head.js | 4 +- .../quicksuggest/unit/test_quicksuggest_merino.js | 2 +- .../unit/test_quicksuggest_merinoSessions.js | 2 +- browser/components/urlbar/tests/unit/head.js | 6 +- .../unit/test_autofill_origins_alt_frecency.js | 2 +- .../formautofill/content/manageDialog.js | 7 +- .../report-site-issue/experimentalAPIs/l10n.js | 4 +- .../extensions/search-detection/extension/api.js | 2 +- browser/fxr/content/fxrui.js | 2 +- devtools/client/framework/test/allocations/head.js | 2 +- .../test/browser_jsonview_expand_collapse.js | 2 +- devtools/client/netmonitor/src/har/har-utils.js | 6 +- devtools/client/styleeditor/panel.js | 17 ++-- .../test/xpcshell/test_register_5xxCode_http2.js | 2 +- .../xpcshell/test_resubscribe_4xxCode_http2.js | 2 +- .../xpcshell/test_resubscribe_5xxCode_http2.js | 2 +- ...st_resubscribe_listening_for_msg_error_http2.js | 2 +- .../test_csp_upgrade_insecure_request_header.js | 5 +- .../test/unit/test_https_only_https_first_prefs.js | 5 +- image/test/unit/test_async_notification_404.js | 6 +- mobile/android/chrome/geckoview/geckoview.js | 2 +- .../httpserver/test/test_basic_functionality.js | 4 +- netwerk/test/httpserver/test/test_body_length.js | 2 +- netwerk/test/httpserver/test/test_byte_range.js | 4 +- netwerk/test/httpserver/test/test_cern_meta.js | 4 +- .../httpserver/test/test_default_index_handler.js | 4 +- netwerk/test/httpserver/test/test_empty_body.js | 2 +- .../httpserver/test/test_errorhandler_exception.js | 2 +- netwerk/test/httpserver/test/test_header_array.js | 2 +- netwerk/test/httpserver/test/test_name_scheme.js | 4 +- netwerk/test/httpserver/test/test_processasync.js | 4 +- netwerk/test/httpserver/test/test_qi.js | 2 +- .../test/httpserver/test/test_registerdirectory.js | 4 +- netwerk/test/httpserver/test/test_registerfile.js | 4 +- .../test/httpserver/test/test_registerprefix.js | 4 +- .../test/httpserver/test/test_response_write.js | 2 +- netwerk/test/httpserver/test/test_seizepower.js | 4 +- .../test/httpserver/test/test_setindexhandler.js | 4 +- netwerk/test/httpserver/test/test_setstatusline.js | 4 +- .../test/httpserver/test/test_sjs_object_state.js | 2 +- netwerk/test/httpserver/test/test_sjs_state.js | 4 +- .../test/test_sjs_throwing_exceptions.js | 4 +- netwerk/test/httpserver/test/test_start_stop.js | 4 +- .../test/httpserver/test/test_start_stop_ipv6.js | 4 +- netwerk/test/unit/test_304_headers.js | 2 +- netwerk/test/unit/test_304_responses.js | 4 +- netwerk/test/unit/test_307_redirect.js | 6 +- netwerk/test/unit/test_421.js | 2 +- netwerk/test/unit/test_SuperfluousAuth.js | 2 +- netwerk/test/unit/test_XHR_redirects.js | 4 +- netwerk/test/unit/test_alt-data_closeWithStatus.js | 2 +- netwerk/test/unit/test_alt-data_cross_process.js | 2 +- netwerk/test/unit/test_alt-data_overwrite.js | 2 +- netwerk/test/unit/test_alt-data_simple.js | 2 +- netwerk/test/unit/test_alt-data_stream.js | 2 +- netwerk/test/unit/test_auth_dialog_permission.js | 2 +- netwerk/test/unit/test_auth_multiple.js | 2 +- netwerk/test/unit/test_authentication.js | 4 +- netwerk/test/unit/test_brotli_http.js | 2 +- .../test/unit/test_brotli_unknown_content_type.js | 4 +- netwerk/test/unit/test_bug1064258.js | 2 +- netwerk/test/unit/test_bug1177909.js | 2 +- netwerk/test/unit/test_bug1527293.js | 2 +- netwerk/test/unit/test_bug1683176.js | 2 +- netwerk/test/unit/test_bug528292.js | 6 +- netwerk/test/unit/test_bug586908.js | 2 +- netwerk/test/unit/test_bug667907.js | 4 +- netwerk/test/unit/test_bug669001.js | 2 +- netwerk/test/unit/test_bug812167.js | 4 +- netwerk/test/unit/test_cache-entry-id.js | 2 +- ...9a-concurrent_read_resumable_entry_size_zero.js | 2 +- ...oncurrent_read_non-resumable_entry_size_zero.js | 2 +- ..._cache2-29c-concurrent_read_half-interrupted.js | 2 +- ...ache2-29d-concurrent_read_half-corrupted-206.js | 2 +- ...e2-29e-concurrent_read_half-non-206-response.js | 2 +- netwerk/test/unit/test_cache_jar.js | 2 +- netwerk/test/unit/test_captive_portal_service.js | 2 +- netwerk/test/unit/test_channel_close.js | 2 +- netwerk/test/unit/test_chunked_responses.js | 2 +- netwerk/test/unit/test_content_length_underrun.js | 2 +- netwerk/test/unit/test_cookie_header.js | 2 +- netwerk/test/unit/test_cookie_ipv6.js | 2 +- netwerk/test/unit/test_cookiejars.js | 2 +- netwerk/test/unit/test_cookiejars_safebrowsing.js | 2 +- netwerk/test/unit/test_dns_retry.js | 8 +- netwerk/test/unit/test_duplicate_headers.js | 2 +- netwerk/test/unit/test_event_sink.js | 2 +- netwerk/test/unit/test_head.js | 2 +- netwerk/test/unit/test_headers.js | 2 +- netwerk/test/unit/test_httpsuspend.js | 2 +- netwerk/test/unit/test_inhibit_caching.js | 2 +- netwerk/test/unit/test_mismatch_last-modified.js | 4 +- netwerk/test/unit/test_multipart_byteranges.js | 2 +- .../unit/test_multipart_streamconv-byte-by-byte.js | 2 +- netwerk/test/unit/test_multipart_streamconv.js | 2 +- ...part_streamconv_missing_boundary_lead_dashes.js | 2 +- ...t_multipart_streamconv_missing_lead_boundary.js | 2 +- .../test/unit/test_network_connectivity_service.js | 4 +- netwerk/test/unit/test_ntlm_authentication.js | 4 +- netwerk/test/unit/test_ntlm_proxy_and_web_auth.js | 2 +- netwerk/test/unit/test_ntlm_proxy_auth.js | 2 +- netwerk/test/unit/test_ntlm_web_auth.js | 2 +- .../test/unit/test_original_sent_received_head.js | 2 +- ...est_partial_response_entry_size_smart_shrink.js | 2 +- netwerk/test/unit/test_post.js | 2 +- netwerk/test/unit/test_progress.js | 2 +- netwerk/test/unit/test_rcwn_interrupted.js | 2 +- .../test/unit/test_redirect-caching_canceled.js | 4 +- netwerk/test/unit/test_redirect-caching_failure.js | 4 +- netwerk/test/unit/test_redirect-caching_passing.js | 4 +- netwerk/test/unit/test_redirect_baduri.js | 2 +- netwerk/test/unit/test_redirect_canceled.js | 4 +- .../test/unit/test_redirect_different-protocol.js | 4 +- netwerk/test/unit/test_redirect_failure.js | 4 +- netwerk/test/unit/test_redirect_from_script.js | 16 ++-- ...test_redirect_from_script_after-open_passing.js | 16 ++-- netwerk/test/unit/test_redirect_history.js | 2 +- netwerk/test/unit/test_redirect_passing.js | 4 +- netwerk/test/unit/test_redirect_veto.js | 4 +- netwerk/test/unit/test_reentrancy.js | 2 +- netwerk/test/unit/test_resumable_channel.js | 2 +- netwerk/test/unit/test_separate_connections.js | 2 +- .../test/unit/test_suspend_channel_on_authRetry.js | 2 +- netwerk/test/unit/test_synthesized_response.js | 2 +- .../unit/test_tls_flags_separate_connections.js | 2 +- netwerk/test/unit/test_trr_proxy.js | 2 +- netwerk/test/unit_ipc/child_veto_in_parent.js | 4 +- .../test/unit_ipc/test_cookie_header_stripped.js | 2 +- .../pki/resources/content/changepassword.js | 2 +- .../test/browser_content_sandbox_syscalls.js | 4 +- services/common/kinto-offline-client.js | 2 +- services/sync/tests/unit/head_helpers.js | 4 +- .../components/aboutmemory/content/aboutMemory.js | 6 +- .../aboutprocesses/content/aboutProcesses.js | 2 +- .../test/xpcshell/test_tracking_db_service.js | 2 +- .../test/unit/test_DownloadIntegration.js | 2 +- toolkit/components/extensions/child/ext-test.js | 2 +- .../extensions/parent/ext-backgroundPage.js | 2 +- .../extensions/parent/ext-geckoProfiler.js | 2 +- .../components/extensions/parent/ext-management.js | 2 +- .../components/extensions/parent/ext-storage.js | 2 +- .../test/xpcshell/test_proxy_failover.js | 2 +- .../test/browser/head.js | 2 +- .../test/browser/browser_asrouter_trigger_docs.js | 2 +- .../test/unit/test_ExperimentAPI_NimbusFeatures.js | 2 +- .../passwordmgr/test/unit/test_context_menu.js | 2 +- toolkit/components/places/tests/head_common.js | 6 +- .../shopping/content/ShoppingProduct.mjs | 2 +- .../telemetry/tests/unit/test_PingAPI.js | 2 +- .../tests/unit/test_TelemetryController.js | 2 +- .../telemetry/tests/unit/test_TelemetrySession.js | 2 +- .../test_TelemetrySession_abortedSessionQueued.js | 2 +- .../tests/unit/consumerNotifications.js | 2 +- toolkit/content/aboutLogging.js | 2 +- toolkit/content/widgets/browser-custom-element.js | 4 +- toolkit/mozapps/extensions/content/aboutaddons.js | 2 +- .../extensions/test/xpcshell/head_addons.js | 2 +- .../extensions/test/xpcshell/head_system_addons.js | 2 +- .../extensions/test/xpcshell/test_gmpProvider.js | 2 +- .../extensions/test/xpcshell/test_update_theme.js | 2 +- .../test/xpcshell/test_webextension_langpack.js | 2 +- toolkit/mozapps/update/tests/data/shared.js | 6 +- .../mozapps/update/tests/data/xpcshellUtilsAUS.js | 106 +++++++++++---------- 208 files changed, 390 insertions(+), 400 deletions(-) diff --git a/browser/base/content/browser-addons.js b/browser/base/content/browser-addons.js index f8ddfc138fff..d7f6c34b5ce6 100644 --- a/browser/base/content/browser-addons.js +++ b/browser/base/content/browser-addons.js @@ -20,7 +20,7 @@ ChromeUtils.defineESModuleGetters(lazy, { SITEPERMS_ADDON_TYPE: "resource://gre/modules/addons/siteperms-addon-utils.sys.mjs", }); -XPCOMUtils.defineLazyGetter(lazy, "l10n", function () { +ChromeUtils.defineLazyGetter(lazy, "l10n", function () { return new Localization( ["browser/addonNotifications.ftl", "branding/brand.ftl"], true diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/base/content/browser-fullScreenAndPointerLock.js index af3856f02bff..7fa505e8a89d 100644 --- a/browser/base/content/browser-fullScreenAndPointerLock.js +++ b/browser/base/content/browser-fullScreenAndPointerLock.js @@ -937,7 +937,7 @@ var FullScreen = { }, }; -XPCOMUtils.defineLazyGetter(FullScreen, "_permissionNotificationIDs", () => { +ChromeUtils.defineLazyGetter(FullScreen, "_permissionNotificationIDs", () => { let { PermissionUI } = ChromeUtils.importESModule( "resource:///modules/PermissionUI.sys.mjs" ); diff --git a/browser/base/content/browser-siteProtections.js b/browser/base/content/browser-siteProtections.js index a1a37236f80a..c05f072651aa 100644 --- a/browser/base/content/browser-siteProtections.js +++ b/browser/base/content/browser-siteProtections.js @@ -81,29 +81,29 @@ class ProtectionCategory { l10nId = l10nId || id; this.strings = {}; - XPCOMUtils.defineLazyGetter(this.strings, "subViewBlocked", () => + ChromeUtils.defineLazyGetter(this.strings, "subViewBlocked", () => gNavigatorBundle.getString(`contentBlocking.${l10nId}View.blocked.label`) ); - XPCOMUtils.defineLazyGetter(this.strings, "subViewTitleBlocking", () => + ChromeUtils.defineLazyGetter(this.strings, "subViewTitleBlocking", () => gNavigatorBundle.getString(`protections.blocking.${l10nId}.title`) ); - XPCOMUtils.defineLazyGetter(this.strings, "subViewTitleNotBlocking", () => + ChromeUtils.defineLazyGetter(this.strings, "subViewTitleNotBlocking", () => gNavigatorBundle.getString(`protections.notBlocking.${l10nId}.title`) ); - XPCOMUtils.defineLazyGetter(this, "subView", () => + ChromeUtils.defineLazyGetter(this, "subView", () => document.getElementById(`protections-popup-${this._id}View`) ); - XPCOMUtils.defineLazyGetter(this, "subViewHeading", () => + ChromeUtils.defineLazyGetter(this, "subViewHeading", () => document.getElementById(`protections-popup-${this._id}View-heading`) ); - XPCOMUtils.defineLazyGetter(this, "subViewList", () => + ChromeUtils.defineLazyGetter(this, "subViewList", () => document.getElementById(`protections-popup-${this._id}View-list`) ); - XPCOMUtils.defineLazyGetter(this, "subViewShimAllowHint", () => + ChromeUtils.defineLazyGetter(this, "subViewShimAllowHint", () => document.getElementById( `protections-popup-${this._id}View-shim-allow-hint` ) @@ -363,7 +363,7 @@ let TrackingProtection = ); // Blocked label has custom key, overwrite the getter. - XPCOMUtils.defineLazyGetter(this.strings, "subViewBlocked", () => + ChromeUtils.defineLazyGetter(this.strings, "subViewBlocked", () => gNavigatorBundle.getString("contentBlocking.trackersView.blocked.label") ); @@ -607,19 +607,22 @@ let ThirdPartyCookies = } ); - XPCOMUtils.defineLazyGetter(this, "categoryLabel", () => + ChromeUtils.defineLazyGetter(this, "categoryLabel", () => document.getElementById("protections-popup-cookies-category-label") ); // Not blocking title has custom key, overwrite the getter. - XPCOMUtils.defineLazyGetter(this.strings, "subViewTitleNotBlocking", () => - gNavigatorBundle.getString( - "protections.notBlocking.crossSiteTrackingCookies.title" - ) + ChromeUtils.defineLazyGetter( + this.strings, + "subViewTitleNotBlocking", + () => + gNavigatorBundle.getString( + "protections.notBlocking.crossSiteTrackingCookies.title" + ) ); // Cookie permission state label. - XPCOMUtils.defineLazyGetter(this.strings, "subViewAllowed", () => + ChromeUtils.defineLazyGetter(this.strings, "subViewAllowed", () => gNavigatorBundle.getString("contentBlocking.cookiesView.allowed.label") ); @@ -1143,24 +1146,24 @@ let cookieBannerHandling = new (class { "cookiebanners.ui.desktop.enabled", false ); - XPCOMUtils.defineLazyGetter(this, "_cookieBannerSection", () => + ChromeUtils.defineLazyGetter(this, "_cookieBannerSection", () => document.getElementById("protections-popup-cookie-banner-section") ); - XPCOMUtils.defineLazyGetter(this, "_cookieBannerSectionSeparator", () => + ChromeUtils.defineLazyGetter(this, "_cookieBannerSectionSeparator", () => document.getElementById( "protections-popup-cookie-banner-section-separator" ) ); - XPCOMUtils.defineLazyGetter(this, "_cookieBannerSwitch", () => + ChromeUtils.defineLazyGetter(this, "_cookieBannerSwitch", () => document.getElementById("protections-popup-cookie-banner-switch") ); - XPCOMUtils.defineLazyGetter(this, "_cookieBannerSubview", () => + ChromeUtils.defineLazyGetter(this, "_cookieBannerSubview", () => document.getElementById("protections-popup-cookieBannerView") ); - XPCOMUtils.defineLazyGetter(this, "_cookieBannerEnableSite", () => + ChromeUtils.defineLazyGetter(this, "_cookieBannerEnableSite", () => document.getElementById("cookieBannerView-enable-site") ); - XPCOMUtils.defineLazyGetter(this, "_cookieBannerDisableSite", () => + ChromeUtils.defineLazyGetter(this, "_cookieBannerDisableSite", () => document.getElementById("cookieBannerView-disable-site") ); } diff --git a/browser/base/content/browser-thumbnails.js b/browser/base/content/browser-thumbnails.js index e17f5aa05b32..1162914ddfe6 100644 --- a/browser/base/content/browser-thumbnails.js +++ b/browser/base/content/browser-thumbnails.js @@ -100,7 +100,7 @@ var gBrowserThumbnails = { } // Delete the defined property delete this._topSiteURLs; - XPCOMUtils.defineLazyGetter(this, "_topSiteURLs", getTopSiteURLs); + ChromeUtils.defineLazyGetter(this, "_topSiteURLs", getTopSiteURLs); }, notify: function Thumbnails_notify(timer) { @@ -221,4 +221,8 @@ async function getTopSiteURLs() { }, []); } -XPCOMUtils.defineLazyGetter(gBrowserThumbnails, "_topSiteURLs", getTopSiteURLs); +ChromeUtils.defineLazyGetter( + gBrowserThumbnails, + "_topSiteURLs", + getTopSiteURLs +); diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 5edd785f2af2..7b5f51c624b2 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -103,7 +103,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { CFRPageActions: "resource://activity-stream/lib/CFRPageActions.jsm", }); -XPCOMUtils.defineLazyGetter(this, "fxAccounts", () => { +ChromeUtils.defineLazyGetter(this, "fxAccounts", () => { return ChromeUtils.importESModule( "resource://gre/modules/FxAccounts.sys.mjs" ).getFxAccountsSingleton(); @@ -309,34 +309,34 @@ if (AppConstants.ENABLE_WEBDRIVER) { this.RemoteAgent = { running: false }; } -XPCOMUtils.defineLazyGetter(this, "RTL_UI", () => { +ChromeUtils.defineLazyGetter(this, "RTL_UI", () => { return Services.locale.isAppLocaleRTL; }); -XPCOMUtils.defineLazyGetter(this, "gBrandBundle", () => { +ChromeUtils.defineLazyGetter(this, "gBrandBundle", () => { return Services.strings.createBundle( "chrome://branding/locale/brand.properties" ); }); -XPCOMUtils.defineLazyGetter(this, "gBrowserBundle", () => { +ChromeUtils.defineLazyGetter(this, "gBrowserBundle", () => { return Services.strings.createBundle( "chrome://browser/locale/browser.properties" ); }); -XPCOMUtils.defineLazyGetter(this, "gCustomizeMode", () => { +ChromeUtils.defineLazyGetter(this, "gCustomizeMode", () => { let { CustomizeMode } = ChromeUtils.importESModule( "resource:///modules/CustomizeMode.sys.mjs" ); return new CustomizeMode(window); }); -XPCOMUtils.defineLazyGetter(this, "gNavToolbox", () => { +ChromeUtils.defineLazyGetter(this, "gNavToolbox", () => { return document.getElementById("navigator-toolbox"); }); -XPCOMUtils.defineLazyGetter(this, "gURLBar", () => { +ChromeUtils.defineLazyGetter(this, "gURLBar", () => { let urlbar = new UrlbarInput({ textbox: document.getElementById("urlbar"), eventTelemetryCategory: "urlbar", @@ -379,7 +379,7 @@ XPCOMUtils.defineLazyGetter(this, "gURLBar", () => { return urlbar; }); -XPCOMUtils.defineLazyGetter(this, "ReferrerInfo", () => +ChromeUtils.defineLazyGetter(this, "ReferrerInfo", () => Components.Constructor( "@mozilla.org/referrer-info;1", "nsIReferrerInfo", @@ -388,7 +388,7 @@ XPCOMUtils.defineLazyGetter(this, "ReferrerInfo", () => ); // High priority notification bars shown at the top of the window. -XPCOMUtils.defineLazyGetter(this, "gNotificationBox", () => { +ChromeUtils.defineLazyGetter(this, "gNotificationBox", () => { return new MozElements.NotificationBox(element => { element.classList.add("global-notificationbox"); element.setAttribute("notificationside", "top"); @@ -398,14 +398,14 @@ XPCOMUtils.defineLazyGetter(this, "gNotificationBox", () => { }); }); -XPCOMUtils.defineLazyGetter(this, "InlineSpellCheckerUI", () => { +ChromeUtils.defineLazyGetter(this, "InlineSpellCheckerUI", () => { let { InlineSpellChecker } = ChromeUtils.importESModule( "resource://gre/modules/InlineSpellChecker.sys.mjs" ); return new InlineSpellChecker(); }); -XPCOMUtils.defineLazyGetter(this, "PopupNotifications", () => { +ChromeUtils.defineLazyGetter(this, "PopupNotifications", () => { // eslint-disable-next-line no-shadow let { PopupNotifications } = ChromeUtils.importESModule( "resource://gre/modules/PopupNotifications.sys.mjs" @@ -460,7 +460,7 @@ XPCOMUtils.defineLazyGetter(this, "PopupNotifications", () => { } }); -XPCOMUtils.defineLazyGetter(this, "MacUserActivityUpdater", () => { +ChromeUtils.defineLazyGetter(this, "MacUserActivityUpdater", () => { if (AppConstants.platform != "macosx") { return null; } @@ -470,7 +470,7 @@ XPCOMUtils.defineLazyGetter(this, "MacUserActivityUpdater", () => { ); }); -XPCOMUtils.defineLazyGetter(this, "Win7Features", () => { +ChromeUtils.defineLazyGetter(this, "Win7Features", () => { if (AppConstants.platform != "win") { return null; } @@ -2511,7 +2511,7 @@ var gBrowserInit = { }, }; -XPCOMUtils.defineLazyGetter( +ChromeUtils.defineLazyGetter( gBrowserInit, "_firstContentWindowPaintDeferred", () => PromiseUtils.defer() diff --git a/browser/base/content/tabbrowser.js b/browser/base/content/tabbrowser.js index 480c241ba6ab..c6e8db39fe9a 100644 --- a/browser/base/content/tabbrowser.js +++ b/browser/base/content/tabbrowser.js @@ -92,7 +92,7 @@ "nsIMacSharingService", ], }); - XPCOMUtils.defineLazyGetter(this, "tabLocalization", () => { + ChromeUtils.defineLazyGetter(this, "tabLocalization", () => { return new Localization( ["browser/tabbrowser.ftl", "branding/brand.ftl"], true diff --git a/browser/base/content/test/popupNotifications/head.js b/browser/base/content/test/popupNotifications/head.js index f347f8dbf207..fd935975310d 100644 --- a/browser/base/content/test/popupNotifications/head.js +++ b/browser/base/content/test/popupNotifications/head.js @@ -277,7 +277,7 @@ function checkPopup(popup, notifyObj) { }); } -XPCOMUtils.defineLazyGetter(this, "gActiveListeners", () => { +ChromeUtils.defineLazyGetter(this, "gActiveListeners", () => { let listeners = new Map(); registerCleanupFunction(() => { for (let [listener, eventName] of listeners) { diff --git a/browser/base/content/test/protectionsUI/head.js b/browser/base/content/test/protectionsUI/head.js index 28395ad7329d..9e8cbdf07f15 100644 --- a/browser/base/content/test/protectionsUI/head.js +++ b/browser/base/content/test/protectionsUI/head.js @@ -12,7 +12,7 @@ XPCOMUtils.defineLazyServiceGetter( "nsITrackingDBService" ); -XPCOMUtils.defineLazyGetter(this, "TRACK_DB_PATH", function () { +ChromeUtils.defineLazyGetter(this, "TRACK_DB_PATH", function () { return PathUtils.join(PathUtils.profileDir, "protections.sqlite"); }); diff --git a/browser/base/content/test/webextensions/head.js b/browser/base/content/test/webextensions/head.js index b07ac579a555..ec4cd594c497 100644 --- a/browser/base/content/test/webextensions/head.js +++ b/browser/base/content/test/webextensions/head.js @@ -7,7 +7,7 @@ const BASE = getRootDirectory(gTestPath).replace( "https://example.com/" ); -XPCOMUtils.defineLazyGetter(this, "Management", () => { +ChromeUtils.defineLazyGetter(this, "Management", () => { // eslint-disable-next-line no-shadow const { Management } = ChromeUtils.importESModule( "resource://gre/modules/Extension.sys.mjs" diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js index bee522db3947..04025579ad28 100644 --- a/browser/base/content/utilityOverlay.js +++ b/browser/base/content/utilityOverlay.js @@ -24,7 +24,7 @@ ChromeUtils.defineESModuleGetters(this, { URILoadingHelper: "resource:///modules/URILoadingHelper.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "ReferrerInfo", () => +ChromeUtils.defineLazyGetter(this, "ReferrerInfo", () => Components.Constructor( "@mozilla.org/referrer-info;1", "nsIReferrerInfo", diff --git a/browser/components/customizableui/test/browser_proton_moreTools_panel.js b/browser/components/customizableui/test/browser_proton_moreTools_panel.js index d78cf946f884..8104b8920e74 100644 --- a/browser/components/customizableui/test/browser_proton_moreTools_panel.js +++ b/browser/components/customizableui/test/browser_proton_moreTools_panel.js @@ -3,7 +3,7 @@ "use strict"; -XPCOMUtils.defineLazyGetter(this, "DevToolsStartup", () => { +ChromeUtils.defineLazyGetter(this, "DevToolsStartup", () => { return Cc["@mozilla.org/devtools/startup-clh;1"].getService( Ci.nsICommandLineHandler ).wrappedJSObject; diff --git a/browser/components/downloads/content/downloads.js b/browser/components/downloads/content/downloads.js index 810001899c5e..482e84f23355 100644 --- a/browser/components/downloads/content/downloads.js +++ b/browser/components/downloads/content/downloads.js @@ -1670,13 +1670,13 @@ var DownloadsBlockedSubview = { }, }; -XPCOMUtils.defineLazyGetter(DownloadsBlockedSubview, "panelMultiView", () => +ChromeUtils.defineLazyGetter(DownloadsBlockedSubview, "panelMultiView", () => document.getElementById("downloadsPanel-multiView") ); -XPCOMUtils.defineLazyGetter(DownloadsBlockedSubview, "mainView", () => +ChromeUtils.defineLazyGetter(DownloadsBlockedSubview, "mainView", () => document.getElementById("downloadsPanel-mainView") ); -XPCOMUtils.defineLazyGetter(DownloadsBlockedSubview, "subview", () => +ChromeUtils.defineLazyGetter(DownloadsBlockedSubview, "subview", () => document.getElementById("downloadsPanel-blockedSubview") ); diff --git a/browser/components/extensions/parent/ext-bookmarks.js b/browser/components/extensions/parent/ext-bookmarks.js index 6dbb41dc172d..34bb6cb6cc8d 100644 --- a/browser/components/extensions/parent/ext-bookmarks.js +++ b/browser/components/extensions/parent/ext-bookmarks.js @@ -6,10 +6,6 @@ "use strict"; -var { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); - ChromeUtils.defineESModuleGetters(this, { PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", }); @@ -26,7 +22,7 @@ const BOOKMARKS_TYPES_TO_API_TYPES_MAP = new Map([ const BOOKMARK_SEPERATOR_URL = "data:"; -XPCOMUtils.defineLazyGetter(this, "API_TYPES_TO_BOOKMARKS_TYPES_MAP", () => { +ChromeUtils.defineLazyGetter(this, "API_TYPES_TO_BOOKMARKS_TYPES_MAP", () => { let theMap = new Map(); for (let [code, name] of BOOKMARKS_TYPES_TO_API_TYPES_MAP) { diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js index 8eaee6f506dd..4906a42a0084 100644 --- a/browser/components/extensions/parent/ext-browser.js +++ b/browser/components/extensions/parent/ext-browser.js @@ -243,7 +243,7 @@ global.TabContext = class extends EventEmitter { // None of the code in the WebExtension modules requests that initialization. // It is assumed that it is started at some point. That might never happen, // e.g. if the application shuts down before the search service initializes. -XPCOMUtils.defineLazyGetter(global, "searchInitialized", () => { +ChromeUtils.defineLazyGetter(global, "searchInitialized", () => { if (Services.search.isInitialized) { return Promise.resolve(); } diff --git a/browser/components/extensions/parent/ext-browserAction.js b/browser/components/extensions/parent/ext-browserAction.js index cbf531ea76d1..190cabaebf44 100644 --- a/browser/components/extensions/parent/ext-browserAction.js +++ b/browser/components/extensions/parent/ext-browserAction.js @@ -32,7 +32,7 @@ const POPUP_PRELOAD_TIMEOUT_MS = 200; // WeakMap[Extension -> BrowserAction] const browserActionMap = new WeakMap(); -XPCOMUtils.defineLazyGetter(this, "browserAreas", () => { +ChromeUtils.defineLazyGetter(this, "browserAreas", () => { return { navbar: CustomizableUI.AREA_NAVBAR, menupanel: CustomizableUI.AREA_ADDONS, diff --git a/browser/components/extensions/parent/ext-chrome-settings-overrides.js b/browser/components/extensions/parent/ext-chrome-settings-overrides.js index 3cfca2c98b79..aa5202ba2de7 100644 --- a/browser/components/extensions/parent/ext-chrome-settings-overrides.js +++ b/browser/components/extensions/parent/ext-chrome-settings-overrides.js @@ -32,7 +32,7 @@ const HOMEPAGE_CONFIRMED_TYPE = "homepageNotification"; const HOMEPAGE_SETTING_TYPE = "prefs"; const HOMEPAGE_SETTING_NAME = "homepage_override"; -XPCOMUtils.defineLazyGetter(this, "homepagePopup", () => { +ChromeUtils.defineLazyGetter(this, "homepagePopup", () => { return new ExtensionControlledPopup({ confirmedType: HOMEPAGE_CONFIRMED_TYPE, observerTopic: "browser-open-homepage-start", diff --git a/browser/components/extensions/parent/ext-tabs.js b/browser/components/extensions/parent/ext-tabs.js index dfd051c3a69b..b29a58451b80 100644 --- a/browser/components/extensions/parent/ext-tabs.js +++ b/browser/components/extensions/parent/ext-tabs.js @@ -16,7 +16,7 @@ ChromeUtils.defineESModuleGetters(this, { SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "strBundle", function () { +ChromeUtils.defineLazyGetter(this, "strBundle", function () { return Services.strings.createBundle( "chrome://global/locale/extensions.properties" ); @@ -28,7 +28,7 @@ const TAB_HIDE_CONFIRMED_TYPE = "tabHideNotification"; const TAB_ID_NONE = -1; -XPCOMUtils.defineLazyGetter(this, "tabHidePopup", () => { +ChromeUtils.defineLazyGetter(this, "tabHidePopup", () => { return new ExtensionControlledPopup({ confirmedType: TAB_HIDE_CONFIRMED_TYPE, anchorId: "alltabs-button", diff --git a/browser/components/extensions/parent/ext-url-overrides.js b/browser/components/extensions/parent/ext-url-overrides.js index fec1fdf4f2ee..cff36a8762ba 100644 --- a/browser/components/extensions/parent/ext-url-overrides.js +++ b/browser/components/extensions/parent/ext-url-overrides.js @@ -22,7 +22,7 @@ const NEW_TAB_CONFIRMED_TYPE = "newTabNotification"; const NEW_TAB_PRIVATE_ALLOWED = "browser.newtab.privateAllowed"; const NEW_TAB_EXTENSION_CONTROLLED = "browser.newtab.extensionControlled"; -XPCOMUtils.defineLazyGetter(this, "newTabPopup", () => { +ChromeUtils.defineLazyGetter(this, "newTabPopup", () => { return new ExtensionControlledPopup({ confirmedType: NEW_TAB_CONFIRMED_TYPE, observerTopic: "browser-open-newtab-start", diff --git a/browser/components/extensions/test/browser/head_devtools.js b/browser/components/extensions/test/browser/head_devtools.js index f46254d43591..9a9a1862e335 100644 --- a/browser/components/extensions/test/browser/head_devtools.js +++ b/browser/components/extensions/test/browser/head_devtools.js @@ -15,7 +15,7 @@ ChromeUtils.defineESModuleGetters(this, { loader: "resource://devtools/shared/loader/Loader.sys.mjs", DevToolsShim: "chrome://devtools-startup/content/DevToolsShim.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "gDevTools", () => { +ChromeUtils.defineLazyGetter(this, "gDevTools", () => { const { gDevTools } = loader.require("devtools/client/framework/devtools"); return gDevTools; }); diff --git a/browser/components/firefoxview/fxview-tab-list.mjs b/browser/components/firefoxview/fxview-tab-list.mjs index 884ab96d2b79..d7957e17b3e8 100644 --- a/browser/components/firefoxview/fxview-tab-list.mjs +++ b/browser/components/firefoxview/fxview-tab-list.mjs @@ -18,7 +18,7 @@ if (!window.IS_STORYBOOK) { XPCOMUtils = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ).XPCOMUtils; - XPCOMUtils.defineLazyGetter(lazy, "relativeTimeFormat", () => { + ChromeUtils.defineLazyGetter(lazy, "relativeTimeFormat", () => { return new Services.intl.RelativeTimeFormat(undefined, { style: "narrow", }); diff --git a/browser/components/firefoxview/helpers.mjs b/browser/components/firefoxview/helpers.mjs index 29d954d40de5..327655b5d4a2 100644 --- a/browser/components/firefoxview/helpers.mjs +++ b/browser/components/firefoxview/helpers.mjs @@ -2,17 +2,14 @@ * 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 { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); - const lazy = {}; + ChromeUtils.defineESModuleGetters(lazy, { BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs", PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs", }); -XPCOMUtils.defineLazyGetter(lazy, "relativeTimeFormat", () => { +ChromeUtils.defineLazyGetter(lazy, "relativeTimeFormat", () => { return new Services.intl.RelativeTimeFormat(undefined, { style: "narrow" }); }); diff --git a/browser/components/places/content/controller.js b/browser/components/places/content/controller.js index 0eb9322f7105..3f54aca10c1b 100644 --- a/browser/components/places/content/controller.js +++ b/browser/components/places/content/controller.js @@ -73,7 +73,7 @@ PlacesInsertionPoint.prototype = { function PlacesController(aView) { this._view = aView; - XPCOMUtils.defineLazyGetter(this, "profileName", function () { + ChromeUtils.defineLazyGetter(this, "profileName", function () { return Services.dirsvc.get("ProfD", Ci.nsIFile).leafName; }); diff --git a/browser/components/places/content/editBookmark.js b/browser/components/places/content/editBookmark.js index 54f52412f41c..38ec9c4c3005 100644 --- a/browser/components/places/content/editBookmark.js +++ b/browser/components/places/content/editBookmark.js @@ -1218,7 +1218,7 @@ var gEditItemOverlay = { }, }; -XPCOMUtils.defineLazyGetter(gEditItemOverlay, "_folderTree", () => { +ChromeUtils.defineLazyGetter(gEditItemOverlay, "_folderTree", () => { if (!customElements.get("places-tree")) { Services.scriptloader.loadSubScript( "chrome://browser/content/places/places-tree.js", @@ -1252,7 +1252,7 @@ for (let elt of [ "tagsField", ]) { let eltScoped = elt; - XPCOMUtils.defineLazyGetter(gEditItemOverlay, `_${eltScoped}`, () => + ChromeUtils.defineLazyGetter(gEditItemOverlay, `_${eltScoped}`, () => gEditItemOverlay._element(eltScoped) ); } diff --git a/browser/components/places/tests/browser/head.js b/browser/components/places/tests/browser/head.js index 1827d84cbc89..e2b42f34edcf 100644 --- a/browser/components/places/tests/browser/head.js +++ b/browser/components/places/tests/browser/head.js @@ -2,7 +2,7 @@ ChromeUtils.defineESModuleGetters(this, { PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "gFluentStrings", function () { +ChromeUtils.defineLazyGetter(this, "gFluentStrings", function () { return new Localization(["branding/brand.ftl", "browser/browser.ftl"], true); }); diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js index 820e46fb0065..c20cdb48c26a 100644 --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js @@ -193,7 +193,7 @@ if (AppConstants.MOZ_UPDATER) { } } -XPCOMUtils.defineLazyGetter(this, "gIsPackagedApp", () => { +ChromeUtils.defineLazyGetter(this, "gIsPackagedApp", () => { return Services.sysinfo.getProperty("isPackagedApp"); }); diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js index 36af0176e411..5ec68a24e37a 100644 --- a/browser/components/preferences/preferences.js +++ b/browser/components/preferences/preferences.js @@ -111,7 +111,7 @@ ChromeUtils.defineESModuleGetters(this, { UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "gSubDialog", function () { +ChromeUtils.defineLazyGetter(this, "gSubDialog", function () { const { SubDialogManager } = ChromeUtils.importESModule( "resource://gre/modules/SubDialog.sys.mjs" ); diff --git a/browser/components/preferences/privacy.js b/browser/components/preferences/privacy.js index 3434cc38deba..ba03852b5540 100644 --- a/browser/components/preferences/privacy.js +++ b/browser/components/preferences/privacy.js @@ -49,7 +49,7 @@ const { BEHAVIOR_REJECT_TRACKER_AND_PARTITION_FOREIGN } = Ci.nsICookieService; const PASSWORD_MANAGER_PREF_ID = "services.passwordSavingEnabled"; -XPCOMUtils.defineLazyGetter(this, "AlertsServiceDND", function () { +ChromeUtils.defineLazyGetter(this, "AlertsServiceDND", function () { try { let alertsService = Cc["@mozilla.org/alerts-service;1"] .getService(Ci.nsIAlertsService) diff --git a/browser/components/preferences/tests/browser_primaryPassword.js b/browser/components/preferences/tests/browser_primaryPassword.js index 4de28a1fdb38..1162ca1290da 100644 --- a/browser/components/preferences/tests/browser_primaryPassword.js +++ b/browser/components/preferences/tests/browser_primaryPassword.js @@ -16,7 +16,7 @@ add_task(async function () { let win = doc.defaultView; let dialogURL = ""; let dialogOpened = false; - XPCOMUtils.defineLazyGetter(win, "gSubDialog", () => ({ + ChromeUtils.defineLazyGetter(win, "gSubDialog", () => ({ open(aDialogURL, { closingCallback: aCallback }) { dialogOpened = true; dialogURL = aDialogURL; diff --git a/browser/components/preferences/tests/browser_privacy_firefoxSuggest.js b/browser/components/preferences/tests/browser_privacy_firefoxSuggest.js index 883e19acc2ac..bfaae28e1584 100644 --- a/browser/components/preferences/tests/browser_privacy_firefoxSuggest.js +++ b/browser/components/preferences/tests/browser_privacy_firefoxSuggest.js @@ -9,7 +9,7 @@ ChromeUtils.defineESModuleGetters(this, { QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "QuickSuggestTestUtils", () => { +ChromeUtils.defineLazyGetter(this, "QuickSuggestTestUtils", () => { const { QuickSuggestTestUtils: module } = ChromeUtils.importESModule( "resource://testing-common/QuickSuggestTestUtils.sys.mjs" ); diff --git a/browser/components/preferences/tests/browser_search_searchTerms.js b/browser/components/preferences/tests/browser_search_searchTerms.js index 0af0591355ea..d2ca82dc7810 100644 --- a/browser/components/preferences/tests/browser_search_searchTerms.js +++ b/browser/components/preferences/tests/browser_search_searchTerms.js @@ -7,7 +7,7 @@ "use strict"; -XPCOMUtils.defineLazyGetter(this, "QuickSuggestTestUtils", () => { +ChromeUtils.defineLazyGetter(this, "QuickSuggestTestUtils", () => { const { QuickSuggestTestUtils: module } = ChromeUtils.importESModule( "resource://testing-common/QuickSuggestTestUtils.sys.mjs" ); diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js index f9b935cf7941..6c7ea6321469 100644 --- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js +++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js @@ -6,7 +6,7 @@ ChromeUtils.defineESModuleGetters(this, { UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { +ChromeUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { const { UrlbarTestUtils: module } = ChromeUtils.importESModule( "resource://testing-common/UrlbarTestUtils.sys.mjs" ); diff --git a/browser/components/protections/test/browser/browser_protections_report_ui.js b/browser/components/protections/test/browser/browser_protections_report_ui.js index 6f8d48d6dd29..43e2a6021ed2 100644 --- a/browser/components/protections/test/browser/browser_protections_report_ui.js +++ b/browser/components/protections/test/browser/browser_protections_report_ui.js @@ -18,7 +18,7 @@ XPCOMUtils.defineLazyServiceGetter( "nsITrackingDBService" ); -XPCOMUtils.defineLazyGetter(this, "DB_PATH", function () { +ChromeUtils.defineLazyGetter(this, "DB_PATH", function () { return PathUtils.join(PathUtils.profileDir, "protections.sqlite"); }); diff --git a/browser/components/screenshots/tests/browser/browser_screenshots_test_toggle_pref.js b/browser/components/screenshots/tests/browser/browser_screenshots_test_toggle_pref.js index 1bd193379962..91c0f8c79983 100644 --- a/browser/components/screenshots/tests/browser/browser_screenshots_test_toggle_pref.js +++ b/browser/components/screenshots/tests/browser/browser_screenshots_test_toggle_pref.js @@ -10,7 +10,7 @@ const { sinon } = ChromeUtils.importESModule( ChromeUtils.defineESModuleGetters(this, { ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "ExtensionManagement", () => { +ChromeUtils.defineLazyGetter(this, "ExtensionManagement", () => { const { Management } = ChromeUtils.importESModule( "resource://gre/modules/Extension.sys.mjs" ); diff --git a/browser/components/search/test/browser/telemetry/head.js b/browser/components/search/test/browser/telemetry/head.js index cffd0267b36b..a05441642e43 100644 --- a/browser/components/search/test/browser/telemetry/head.js +++ b/browser/components/search/test/browser/telemetry/head.js @@ -21,11 +21,11 @@ ChromeUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { return module; }); -XPCOMUtils.defineLazyGetter(this, "searchCounts", () => { +ChromeUtils.defineLazyGetter(this, "searchCounts", () => { return Services.telemetry.getKeyedHistogramById("SEARCH_COUNTS"); }); -XPCOMUtils.defineLazyGetter(this, "SEARCH_AD_CLICK_SCALARS", () => { +ChromeUtils.defineLazyGetter(this, "SEARCH_AD_CLICK_SCALARS", () => { const sources = [ ...BrowserSearchTelemetry.KNOWN_SEARCH_SOURCES.values(), "unknown", diff --git a/browser/components/uitour/test/browser_fxa.js b/browser/components/uitour/test/browser_fxa.js index 4b5a867fc465..c1d98a5599b9 100644 --- a/browser/components/uitour/test/browser_fxa.js +++ b/browser/components/uitour/test/browser_fxa.js @@ -7,7 +7,7 @@ const { UIState } = ChromeUtils.importESModule( "resource://services-sync/UIState.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "fxAccounts", () => { +ChromeUtils.defineLazyGetter(this, "fxAccounts", () => { return ChromeUtils.importESModule( "resource://gre/modules/FxAccounts.sys.mjs" ).getFxAccountsSingleton(); diff --git a/browser/components/urlbar/tests/browser-tips/head.js b/browser/components/urlbar/tests/browser-tips/head.js index 94424cf4eff6..8513ef0dd0f7 100644 --- a/browser/components/urlbar/tests/browser-tips/head.js +++ b/browser/components/urlbar/tests/browser-tips/head.js @@ -23,7 +23,7 @@ ChromeUtils.defineESModuleGetters(this, { UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { +ChromeUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { const { UrlbarTestUtils: module } = ChromeUtils.importESModule( "resource://testing-common/UrlbarTestUtils.sys.mjs" ); @@ -31,7 +31,7 @@ XPCOMUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { return module; }); -XPCOMUtils.defineLazyGetter(this, "SearchTestUtils", () => { +ChromeUtils.defineLazyGetter(this, "SearchTestUtils", () => { const { SearchTestUtils: module } = ChromeUtils.importESModule( "resource://testing-common/SearchTestUtils.sys.mjs" ); diff --git a/browser/components/urlbar/tests/browser-updateResults/head.js b/browser/components/urlbar/tests/browser-updateResults/head.js index 7bdb1bcb1f43..d06bb56ad193 100644 --- a/browser/components/urlbar/tests/browser-updateResults/head.js +++ b/browser/components/urlbar/tests/browser-updateResults/head.js @@ -14,7 +14,7 @@ ChromeUtils.defineESModuleGetters(this, { UrlbarView: "resource:///modules/UrlbarView.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { +ChromeUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { const { UrlbarTestUtils: module } = ChromeUtils.importESModule( "resource://testing-common/UrlbarTestUtils.sys.mjs" ); diff --git a/browser/components/urlbar/tests/browser/browser_oneOffs.js b/browser/components/urlbar/tests/browser/browser_oneOffs.js index df42f679459c..b76c610e205f 100644 --- a/browser/components/urlbar/tests/browser/browser_oneOffs.js +++ b/browser/components/urlbar/tests/browser/browser_oneOffs.js @@ -12,7 +12,7 @@ const TEST_ENGINE_BASENAME = "searchSuggestionEngine.xml"; let gMaxResults; let engine; -XPCOMUtils.defineLazyGetter(this, "oneOffSearchButtons", () => { +ChromeUtils.defineLazyGetter(this, "oneOffSearchButtons", () => { return UrlbarTestUtils.getOneOffSearchButtons(window); }); diff --git a/browser/components/urlbar/tests/browser/browser_oneOffs_contextMenu.js b/browser/components/urlbar/tests/browser/browser_oneOffs_contextMenu.js index 60d46608cd1f..4ae083c51f5b 100644 --- a/browser/components/urlbar/tests/browser/browser_oneOffs_contextMenu.js +++ b/browser/components/urlbar/tests/browser/browser_oneOffs_contextMenu.js @@ -11,7 +11,7 @@ const TEST_ENGINE_BASENAME = "searchSuggestionEngine.xml"; let gMaxResults; -XPCOMUtils.defineLazyGetter(this, "oneOffSearchButtons", () => { +ChromeUtils.defineLazyGetter(this, "oneOffSearchButtons", () => { return UrlbarTestUtils.getOneOffSearchButtons(window); }); diff --git a/browser/components/urlbar/tests/browser/browser_oneOffs_heuristicRestyle.js b/browser/components/urlbar/tests/browser/browser_oneOffs_heuristicRestyle.js index 3513fd2dac0c..bfa195926d08 100644 --- a/browser/components/urlbar/tests/browser/browser_oneOffs_heuristicRestyle.js +++ b/browser/components/urlbar/tests/browser/browser_oneOffs_heuristicRestyle.js @@ -8,7 +8,7 @@ "use strict"; -XPCOMUtils.defineLazyGetter(this, "oneOffSearchButtons", () => { +ChromeUtils.defineLazyGetter(this, "oneOffSearchButtons", () => { return UrlbarTestUtils.getOneOffSearchButtons(window); }); diff --git a/browser/components/urlbar/tests/browser/browser_oneOffs_keyModifiers.js b/browser/components/urlbar/tests/browser/browser_oneOffs_keyModifiers.js index 30b241b3b3de..375dd6e9ae3c 100644 --- a/browser/components/urlbar/tests/browser/browser_oneOffs_keyModifiers.js +++ b/browser/components/urlbar/tests/browser/browser_oneOffs_keyModifiers.js @@ -10,7 +10,7 @@ const TEST_ENGINE_BASENAME = "searchSuggestionEngine.xml"; const SEARCH_STRING = "foo.bar"; -XPCOMUtils.defineLazyGetter(this, "oneOffSearchButtons", () => { +ChromeUtils.defineLazyGetter(this, "oneOffSearchButtons", () => { return UrlbarTestUtils.getOneOffSearchButtons(window); }); diff --git a/browser/components/urlbar/tests/browser/head-common.js b/browser/components/urlbar/tests/browser/head-common.js index 7be2d73d3726..2119d3312333 100644 --- a/browser/components/urlbar/tests/browser/head-common.js +++ b/browser/components/urlbar/tests/browser/head-common.js @@ -10,7 +10,7 @@ ChromeUtils.defineESModuleGetters(this, { UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "TEST_BASE_URL", () => +ChromeUtils.defineLazyGetter(this, "TEST_BASE_URL", () => getRootDirectory(gTestPath).replace( "chrome://mochitests/content", "https://example.com" @@ -24,7 +24,7 @@ XPCOMUtils.defineLazyServiceGetter( "nsIClipboardHelper" ); -XPCOMUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { +ChromeUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { const { UrlbarTestUtils: module } = ChromeUtils.importESModule( "resource://testing-common/UrlbarTestUtils.sys.mjs" ); @@ -32,7 +32,7 @@ XPCOMUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { return module; }); -XPCOMUtils.defineLazyGetter(this, "SearchTestUtils", () => { +ChromeUtils.defineLazyGetter(this, "SearchTestUtils", () => { const { SearchTestUtils: module } = ChromeUtils.importESModule( "resource://testing-common/SearchTestUtils.sys.mjs" ); diff --git a/browser/components/urlbar/tests/browser/head.js b/browser/components/urlbar/tests/browser/head.js index 8d38aed52484..95cdd0956b04 100644 --- a/browser/components/urlbar/tests/browser/head.js +++ b/browser/components/urlbar/tests/browser/head.js @@ -26,7 +26,7 @@ ChromeUtils.defineESModuleGetters(this, { sinon: "resource://testing-common/Sinon.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "PlacesFrecencyRecalculator", () => { +ChromeUtils.defineLazyGetter(this, "PlacesFrecencyRecalculator", () => { return Cc["@mozilla.org/places/frecency-recalculator;1"].getService( Ci.nsIObserver ).wrappedJSObject; diff --git a/browser/components/urlbar/tests/engagementTelemetry/browser/head.js b/browser/components/urlbar/tests/engagementTelemetry/browser/head.js index fa623deb5cc3..0bf029091b92 100644 --- a/browser/components/urlbar/tests/engagementTelemetry/browser/head.js +++ b/browser/components/urlbar/tests/engagementTelemetry/browser/head.js @@ -14,7 +14,7 @@ ChromeUtils.defineESModuleGetters(this, { const lazy = {}; -XPCOMUtils.defineLazyGetter(lazy, "QuickSuggestTestUtils", () => { +ChromeUtils.defineLazyGetter(lazy, "QuickSuggestTestUtils", () => { const { QuickSuggestTestUtils: module } = ChromeUtils.importESModule( "resource://testing-common/QuickSuggestTestUtils.sys.mjs" ); @@ -22,7 +22,7 @@ XPCOMUtils.defineLazyGetter(lazy, "QuickSuggestTestUtils", () => { return module; }); -XPCOMUtils.defineLazyGetter(this, "MerinoTestUtils", () => { +ChromeUtils.defineLazyGetter(this, "MerinoTestUtils", () => { const { MerinoTestUtils: module } = ChromeUtils.importESModule( "resource://testing-common/MerinoTestUtils.sys.mjs" ); diff --git a/browser/components/urlbar/tests/ext/api.js b/browser/components/urlbar/tests/ext/api.js index 1bbdf9112c89..a48815177ae8 100644 --- a/browser/components/urlbar/tests/ext/api.js +++ b/browser/components/urlbar/tests/ext/api.js @@ -19,7 +19,7 @@ ChromeUtils.defineESModuleGetters(this, { UrlbarView: "resource:///modules/UrlbarView.sys.mjs", }); -XPCOMUtils.defineLazyGetter( +ChromeUtils.defineLazyGetter( this, "defaultPreferences", () => new Preferences({ defaultBranch: true }) diff --git a/browser/components/urlbar/tests/quicksuggest/browser/head.js b/browser/components/urlbar/tests/quicksuggest/browser/head.js index a3532d51df3c..8309cea51bfd 100644 --- a/browser/components/urlbar/tests/quicksuggest/browser/head.js +++ b/browser/components/urlbar/tests/quicksuggest/browser/head.js @@ -19,7 +19,7 @@ ChromeUtils.defineESModuleGetters(this, { "resource:///modules/UrlbarProviderQuickSuggest.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "QuickSuggestTestUtils", () => { +ChromeUtils.defineLazyGetter(this, "QuickSuggestTestUtils", () => { const { QuickSuggestTestUtils: module } = ChromeUtils.importESModule( "resource://testing-common/QuickSuggestTestUtils.sys.mjs" ); @@ -27,7 +27,7 @@ XPCOMUtils.defineLazyGetter(this, "QuickSuggestTestUtils", () => { return module; }); -XPCOMUtils.defineLazyGetter(this, "MerinoTestUtils", () => { +ChromeUtils.defineLazyGetter(this, "MerinoTestUtils", () => { const { MerinoTestUtils: module } = ChromeUtils.importESModule( "resource://testing-common/MerinoTestUtils.sys.mjs" ); diff --git a/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_merino.js b/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_merino.js index 519a1f93b140..e6bcb7c523dc 100644 --- a/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_merino.js +++ b/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_merino.js @@ -98,7 +98,7 @@ const EXPECTED_MERINO_URLBAR_RESULT = { // `UrlbarProviderQuickSuggest.#merino` is lazily created on the first Merino // fetch, so it's easiest to create `gClient` lazily too. -XPCOMUtils.defineLazyGetter( +ChromeUtils.defineLazyGetter( this, "gClient", () => UrlbarProviderQuickSuggest._test_merino diff --git a/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_merinoSessions.js b/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_merinoSessions.js index 0f8dea63fe2a..ad49ae806f5c 100644 --- a/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_merinoSessions.js +++ b/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_merinoSessions.js @@ -8,7 +8,7 @@ // `UrlbarProviderQuickSuggest.#merino` is lazily created on the first Merino // fetch, so it's easiest to create `gClient` lazily too. -XPCOMUtils.defineLazyGetter( +ChromeUtils.defineLazyGetter( this, "gClient", () => UrlbarProviderQuickSuggest._test_merino diff --git a/browser/components/urlbar/tests/unit/head.js b/browser/components/urlbar/tests/unit/head.js index 9e6e5f35ebb6..757aa7746e22 100644 --- a/browser/components/urlbar/tests/unit/head.js +++ b/browser/components/urlbar/tests/unit/head.js @@ -29,7 +29,7 @@ ChromeUtils.defineESModuleGetters(this, { sinon: "resource://testing-common/Sinon.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "QuickSuggestTestUtils", () => { +ChromeUtils.defineLazyGetter(this, "QuickSuggestTestUtils", () => { const { QuickSuggestTestUtils: module } = ChromeUtils.importESModule( "resource://testing-common/QuickSuggestTestUtils.sys.mjs" ); @@ -37,7 +37,7 @@ XPCOMUtils.defineLazyGetter(this, "QuickSuggestTestUtils", () => { return module; }); -XPCOMUtils.defineLazyGetter(this, "MerinoTestUtils", () => { +ChromeUtils.defineLazyGetter(this, "MerinoTestUtils", () => { const { MerinoTestUtils: module } = ChromeUtils.importESModule( "resource://testing-common/MerinoTestUtils.sys.mjs" ); @@ -53,7 +53,7 @@ ChromeUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { return module; }); -XPCOMUtils.defineLazyGetter(this, "PlacesFrecencyRecalculator", () => { +ChromeUtils.defineLazyGetter(this, "PlacesFrecencyRecalculator", () => { return Cc["@mozilla.org/places/frecency-recalculator;1"].getService( Ci.nsIObserver ).wrappedJSObject; diff --git a/browser/components/urlbar/tests/unit/test_autofill_origins_alt_frecency.js b/browser/components/urlbar/tests/unit/test_autofill_origins_alt_frecency.js index 872f891f634a..debf5b491f32 100644 --- a/browser/components/urlbar/tests/unit/test_autofill_origins_alt_frecency.js +++ b/browser/components/urlbar/tests/unit/test_autofill_origins_alt_frecency.js @@ -9,7 +9,7 @@ // Other existing autofill tests will, of course, need to be adapted once an // algorithm is promoted to be the default. -XPCOMUtils.defineLazyGetter(this, "PlacesFrecencyRecalculator", () => { +ChromeUtils.defineLazyGetter(this, "PlacesFrecencyRecalculator", () => { return Cc["@mozilla.org/places/frecency-recalculator;1"].getService( Ci.nsIObserver ).wrappedJSObject; diff --git a/browser/extensions/formautofill/content/manageDialog.js b/browser/extensions/formautofill/content/manageDialog.js index e05383d1f743..105c5e704f8a 100644 --- a/browser/extensions/formautofill/content/manageDialog.js +++ b/browser/extensions/formautofill/content/manageDialog.js @@ -13,9 +13,6 @@ const EDIT_CREDIT_CARD_URL = const { AppConstants } = ChromeUtils.importESModule( "resource://gre/modules/AppConstants.sys.mjs" ); -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); const { FormAutofill } = ChromeUtils.importESModule( "resource://autofill/FormAutofill.sys.mjs" ); @@ -31,7 +28,7 @@ ChromeUtils.defineESModuleGetters(this, { }); const lazy = {}; -XPCOMUtils.defineLazyGetter( +ChromeUtils.defineLazyGetter( lazy, "l10n", () => @@ -42,7 +39,7 @@ XPCOMUtils.defineLazyGetter( ); this.log = null; -XPCOMUtils.defineLazyGetter(this, "log", () => +ChromeUtils.defineLazyGetter(this, "log", () => FormAutofill.defineLogGetter(this, "manageAddresses") ); diff --git a/browser/extensions/report-site-issue/experimentalAPIs/l10n.js b/browser/extensions/report-site-issue/experimentalAPIs/l10n.js index 1c91e7a04d8f..98944b71a012 100644 --- a/browser/extensions/report-site-issue/experimentalAPIs/l10n.js +++ b/browser/extensions/report-site-issue/experimentalAPIs/l10n.js @@ -4,9 +4,9 @@ "use strict"; -/* global ExtensionAPI, Services, XPCOMUtils */ +/* global ExtensionAPI, Services */ -XPCOMUtils.defineLazyGetter(this, "l10nStrings", function () { +ChromeUtils.defineLazyGetter(this, "l10nStrings", function () { return Services.strings.createBundle( "chrome://report-site-issue/locale/webcompat.properties" ); diff --git a/browser/extensions/search-detection/extension/api.js b/browser/extensions/search-detection/extension/api.js index 873a2ecedda5..ae3336930406 100644 --- a/browser/extensions/search-detection/extension/api.js +++ b/browser/extensions/search-detection/extension/api.js @@ -21,7 +21,7 @@ ChromeUtils.defineESModuleGetters(lazy, { // eslint-disable-next-line mozilla/reject-importGlobalProperties XPCOMUtils.defineLazyGlobalGetters(this, ["ChannelWrapper"]); -XPCOMUtils.defineLazyGetter(this, "searchInitialized", () => { +ChromeUtils.defineLazyGetter(this, "searchInitialized", () => { if (Services.search.isInitialized) { return Promise.resolve(); } diff --git a/browser/fxr/content/fxrui.js b/browser/fxr/content/fxrui.js index b9b7c58e22c9..dd0f55767a48 100644 --- a/browser/fxr/content/fxrui.js +++ b/browser/fxr/content/fxrui.js @@ -49,7 +49,7 @@ XPCOMUtils.defineLazyScriptGetter( "FullScreen", "chrome://fxr/content/fxr-fullScreen.js" ); -XPCOMUtils.defineLazyGetter(this, "gSystemPrincipal", () => +ChromeUtils.defineLazyGetter(this, "gSystemPrincipal", () => Services.scriptSecurityManager.getSystemPrincipal() ); diff --git a/devtools/client/framework/test/allocations/head.js b/devtools/client/framework/test/allocations/head.js index d9bded321a5c..a7e7f56a36fe 100644 --- a/devtools/client/framework/test/allocations/head.js +++ b/devtools/client/framework/test/allocations/head.js @@ -38,7 +38,7 @@ let tracker, releaseTrackerLoader; // => Avoid loading devtools module as much as possible // => If you really have to, lazy load them -XPCOMUtils.defineLazyGetter(this, "TrackedObjects", () => { +ChromeUtils.defineLazyGetter(this, "TrackedObjects", () => { return ChromeUtils.importESModule( "resource://devtools/shared/test-helpers/tracked-objects.sys.mjs" ); diff --git a/devtools/client/jsonview/test/browser_jsonview_expand_collapse.js b/devtools/client/jsonview/test/browser_jsonview_expand_collapse.js index 6b681ff0cc08..c61b91d4c2cf 100644 --- a/devtools/client/jsonview/test/browser_jsonview_expand_collapse.js +++ b/devtools/client/jsonview/test/browser_jsonview_expand_collapse.js @@ -3,7 +3,7 @@ "use strict"; -XPCOMUtils.defineLazyGetter(this, "jsonViewStrings", () => { +ChromeUtils.defineLazyGetter(this, "jsonViewStrings", () => { return Services.strings.createBundle( "chrome://devtools/locale/jsonview.properties" ); diff --git a/devtools/client/netmonitor/src/har/har-utils.js b/devtools/client/netmonitor/src/har/har-utils.js index fc7ae533f15e..08e8557cd88a 100644 --- a/devtools/client/netmonitor/src/har/har-utils.js +++ b/devtools/client/netmonitor/src/har/har-utils.js @@ -4,11 +4,7 @@ "use strict"; -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); - -XPCOMUtils.defineLazyGetter(this, "ZipWriter", function () { +ChromeUtils.defineLazyGetter(this, "ZipWriter", function () { return Components.Constructor("@mozilla.org/zipwriter;1", "nsIZipWriter"); }); diff --git a/devtools/client/styleeditor/panel.js b/devtools/client/styleeditor/panel.js index 46ea6c28c0b7..5a2772d09526 100644 --- a/devtools/client/styleeditor/panel.js +++ b/devtools/client/styleeditor/panel.js @@ -4,9 +4,6 @@ "use strict"; -var { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); var EventEmitter = require("resource://devtools/shared/event-emitter.js"); var { StyleEditorUI } = ChromeUtils.importESModule( @@ -164,8 +161,12 @@ StyleEditorPanel.prototype = { }, }; -XPCOMUtils.defineLazyGetter(StyleEditorPanel.prototype, "strings", function () { - return Services.strings.createBundle( - "chrome://devtools/locale/styleeditor.properties" - ); -}); +ChromeUtils.defineLazyGetter( + StyleEditorPanel.prototype, + "strings", + function () { + return Services.strings.createBundle( + "chrome://devtools/locale/styleeditor.properties" + ); + } +); diff --git a/dom/push/test/xpcshell/test_register_5xxCode_http2.js b/dom/push/test/xpcshell/test_register_5xxCode_http2.js index 84022bc9cc03..a65ed9ec8a78 100644 --- a/dom/push/test/xpcshell/test_register_5xxCode_http2.js +++ b/dom/push/test/xpcshell/test_register_5xxCode_http2.js @@ -9,7 +9,7 @@ const { HttpServer } = ChromeUtils.importESModule( var httpServer = null; -XPCOMUtils.defineLazyGetter(this, "serverPort", function () { +ChromeUtils.defineLazyGetter(this, "serverPort", function () { return httpServer.identity.primaryPort; }); diff --git a/dom/push/test/xpcshell/test_resubscribe_4xxCode_http2.js b/dom/push/test/xpcshell/test_resubscribe_4xxCode_http2.js index 50024cceeaa4..c922d13bc61a 100644 --- a/dom/push/test/xpcshell/test_resubscribe_4xxCode_http2.js +++ b/dom/push/test/xpcshell/test_resubscribe_4xxCode_http2.js @@ -9,7 +9,7 @@ const { HttpServer } = ChromeUtils.importESModule( var httpServer = null; -XPCOMUtils.defineLazyGetter(this, "serverPort", function () { +ChromeUtils.defineLazyGetter(this, "serverPort", function () { return httpServer.identity.primaryPort; }); diff --git a/dom/push/test/xpcshell/test_resubscribe_5xxCode_http2.js b/dom/push/test/xpcshell/test_resubscribe_5xxCode_http2.js index eb6361e5fe2f..b410f2fb2076 100644 --- a/dom/push/test/xpcshell/test_resubscribe_5xxCode_http2.js +++ b/dom/push/test/xpcshell/test_resubscribe_5xxCode_http2.js @@ -9,7 +9,7 @@ const { HttpServer } = ChromeUtils.importESModule( var httpServer = null; -XPCOMUtils.defineLazyGetter(this, "serverPort", function () { +ChromeUtils.defineLazyGetter(this, "serverPort", function () { return httpServer.identity.primaryPort; }); diff --git a/dom/push/test/xpcshell/test_resubscribe_listening_for_msg_error_http2.js b/dom/push/test/xpcshell/test_resubscribe_listening_for_msg_error_http2.js index 4729602ab7c4..1373c3c91ba2 100644 --- a/dom/push/test/xpcshell/test_resubscribe_listening_for_msg_error_http2.js +++ b/dom/push/test/xpcshell/test_resubscribe_listening_for_msg_error_http2.js @@ -9,7 +9,7 @@ const { HttpServer } = ChromeUtils.importESModule( var httpServer = null; -XPCOMUtils.defineLazyGetter(this, "serverPort", function () { +ChromeUtils.defineLazyGetter(this, "serverPort", function () { return httpServer.identity.primaryPort; }); 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 e879ccb8a2a4..26758d261dbd 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 @@ -4,16 +4,13 @@ const { HttpServer } = ChromeUtils.importESModule( const { NetUtil } = ChromeUtils.importESModule( "resource://gre/modules/NetUtil.sys.mjs" ); -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); // Since this test creates a TYPE_DOCUMENT channel via javascript, it will // end up using the wrong LoadInfo constructor. Setting this pref will disable // the ContentPolicyType assertion in the constructor. Services.prefs.setBoolPref("network.loadinfo.skip_type_assertion", true); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); 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 5b20e0ebeefd..9c6ced1fcbec 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 @@ -4,11 +4,8 @@ const { HttpServer } = ChromeUtils.importESModule( const { NetUtil } = ChromeUtils.importESModule( "resource://gre/modules/NetUtil.sys.mjs" ); -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); -XPCOMUtils.defineLazyGetter(this, "HTTP_TEST_URL", function () { +ChromeUtils.defineLazyGetter(this, "HTTP_TEST_URL", function () { return "http://test1.example.com"; }); diff --git a/image/test/unit/test_async_notification_404.js b/image/test/unit/test_async_notification_404.js index c8aab9fe1db1..c4f836750c9c 100644 --- a/image/test/unit/test_async_notification_404.js +++ b/image/test/unit/test_async_notification_404.js @@ -4,15 +4,11 @@ */ /* import-globals-from async_load_tests.js */ -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); - var ioService = Services.io; // This is used in async_load_tests.js // eslint-disable-next-line no-unused-vars -XPCOMUtils.defineLazyGetter(this, "uri", function () { +ChromeUtils.defineLazyGetter(this, "uri", function () { return ioService.newURI( "http://localhost:" + server.identity.primaryPort + diff --git a/mobile/android/chrome/geckoview/geckoview.js b/mobile/android/chrome/geckoview/geckoview.js index f7b6be775071..85fdb46ab00c 100644 --- a/mobile/android/chrome/geckoview/geckoview.js +++ b/mobile/android/chrome/geckoview/geckoview.js @@ -25,7 +25,7 @@ ChromeUtils.defineESModuleGetters(this, { SafeBrowsing: "resource://gre/modules/SafeBrowsing.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "WindowEventDispatcher", () => +ChromeUtils.defineLazyGetter(this, "WindowEventDispatcher", () => EventDispatcher.for(window) ); diff --git a/netwerk/test/httpserver/test/test_basic_functionality.js b/netwerk/test/httpserver/test/test_basic_functionality.js index d00cfa4eb2f6..b8864abd170e 100644 --- a/netwerk/test/httpserver/test/test_basic_functionality.js +++ b/netwerk/test/httpserver/test/test_basic_functionality.js @@ -8,11 +8,11 @@ * Basic functionality test, from the client programmer's POV. */ -XPCOMUtils.defineLazyGetter(this, "port", function () { +ChromeUtils.defineLazyGetter(this, "port", function () { return srv.identity.primaryPort; }); -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new Test( "http://localhost:" + port + "/objHandler", diff --git a/netwerk/test/httpserver/test/test_body_length.js b/netwerk/test/httpserver/test/test_body_length.js index dba81df619c8..85f35d74412d 100644 --- a/netwerk/test/httpserver/test/test_body_length.js +++ b/netwerk/test/httpserver/test/test_body_length.js @@ -41,7 +41,7 @@ function contentLength(request, response) { * BEGIN TESTS * ***************/ -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new Test( "http://localhost:" + srv.identity.primaryPort + "/content-length", diff --git a/netwerk/test/httpserver/test/test_byte_range.js b/netwerk/test/httpserver/test/test_byte_range.js index 94e624bb9058..ef928247347c 100644 --- a/netwerk/test/httpserver/test/test_byte_range.js +++ b/netwerk/test/httpserver/test/test_byte_range.js @@ -8,11 +8,11 @@ // correct data. var srv; -XPCOMUtils.defineLazyGetter(this, "PREFIX", function () { +ChromeUtils.defineLazyGetter(this, "PREFIX", function () { return "http://localhost:" + srv.identity.primaryPort; }); -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new Test( PREFIX + "/range.txt", diff --git a/netwerk/test/httpserver/test/test_cern_meta.js b/netwerk/test/httpserver/test/test_cern_meta.js index b6c3047685a3..3497a88ea727 100644 --- a/netwerk/test/httpserver/test/test_cern_meta.js +++ b/netwerk/test/httpserver/test/test_cern_meta.js @@ -7,11 +7,11 @@ // exercises support for mod_cern_meta-style header/status line modification var srv; -XPCOMUtils.defineLazyGetter(this, "PREFIX", function () { +ChromeUtils.defineLazyGetter(this, "PREFIX", function () { return "http://localhost:" + srv.identity.primaryPort; }); -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new Test(PREFIX + "/test_both.html", null, start_testBoth, null), new Test( diff --git a/netwerk/test/httpserver/test/test_default_index_handler.js b/netwerk/test/httpserver/test/test_default_index_handler.js index 3ee25e95d1e6..efa02cb6e30e 100644 --- a/netwerk/test/httpserver/test/test_default_index_handler.js +++ b/netwerk/test/httpserver/test/test_default_index_handler.js @@ -10,7 +10,7 @@ var srv, dir, gDirEntries; -XPCOMUtils.defineLazyGetter(this, "BASE_URL", function () { +ChromeUtils.defineLazyGetter(this, "BASE_URL", function () { return "http://localhost:" + srv.identity.primaryPort + "/"; }); @@ -216,7 +216,7 @@ function makeFile(name, isDirectory, parentDir, lst) { * TESTS * *********/ -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new Test(BASE_URL, null, start, stopRootDirectory), new Test(BASE_URL + "foo/", null, start, stopFooDirectory), diff --git a/netwerk/test/httpserver/test/test_empty_body.js b/netwerk/test/httpserver/test/test_empty_body.js index 9e4a2fbdab67..fa9b7cbfdc1d 100644 --- a/netwerk/test/httpserver/test/test_empty_body.js +++ b/netwerk/test/httpserver/test/test_empty_body.js @@ -9,7 +9,7 @@ var srv; -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new Test( "http://localhost:" + srv.identity.primaryPort + "/empty-body-unwritten", diff --git a/netwerk/test/httpserver/test/test_errorhandler_exception.js b/netwerk/test/httpserver/test/test_errorhandler_exception.js index 25ccbc97008a..e9cdb0bf4f05 100644 --- a/netwerk/test/httpserver/test/test_errorhandler_exception.js +++ b/netwerk/test/httpserver/test/test_errorhandler_exception.js @@ -7,7 +7,7 @@ // Request handlers may throw exceptions, and those exception should be caught // by the server and converted into the proper error codes. -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new Test( "http://localhost:" + srv.identity.primaryPort + "/throws/exception", diff --git a/netwerk/test/httpserver/test/test_header_array.js b/netwerk/test/httpserver/test/test_header_array.js index 18a08cce519a..1579c5ceeb9c 100644 --- a/netwerk/test/httpserver/test/test_header_array.js +++ b/netwerk/test/httpserver/test/test_header_array.js @@ -44,7 +44,7 @@ function pathHandler(request, response) { * BEGIN TESTS * ***************/ -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new Test( "http://localhost:" + srv.identity.primaryPort + "/path-handler", diff --git a/netwerk/test/httpserver/test/test_name_scheme.js b/netwerk/test/httpserver/test/test_name_scheme.js index 7c50e6eceaa4..4f9fefe159a0 100644 --- a/netwerk/test/httpserver/test/test_name_scheme.js +++ b/netwerk/test/httpserver/test/test_name_scheme.js @@ -10,11 +10,11 @@ var srv; -XPCOMUtils.defineLazyGetter(this, "PREFIX", function () { +ChromeUtils.defineLazyGetter(this, "PREFIX", function () { return "http://localhost:" + srv.identity.primaryPort; }); -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new Test(PREFIX + "/bar.html^", null, start_bar_html_, null), new Test(PREFIX + "/foo.html^", null, start_foo_html_, null), diff --git a/netwerk/test/httpserver/test/test_processasync.js b/netwerk/test/httpserver/test/test_processasync.js index 14dab1f0935e..321c9b086f10 100644 --- a/netwerk/test/httpserver/test/test_processasync.js +++ b/netwerk/test/httpserver/test/test_processasync.js @@ -8,7 +8,7 @@ * Tests for correct behavior of asynchronous responses. */ -XPCOMUtils.defineLazyGetter(this, "PREPATH", function () { +ChromeUtils.defineLazyGetter(this, "PREPATH", function () { return "http://localhost:" + srv.identity.primaryPort; }); @@ -28,7 +28,7 @@ function run_test() { * BEGIN TESTS * ***************/ -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new Test(PREPATH + "/handleSync", null, start_handleSync, null), new Test( diff --git a/netwerk/test/httpserver/test/test_qi.js b/netwerk/test/httpserver/test/test_qi.js index ecd376afc70b..e88e53119e85 100644 --- a/netwerk/test/httpserver/test/test_qi.js +++ b/netwerk/test/httpserver/test/test_qi.js @@ -11,7 +11,7 @@ * created by XPConnect. */ -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new Test( "http://localhost:" + srv.identity.primaryPort + "/test", diff --git a/netwerk/test/httpserver/test/test_registerdirectory.js b/netwerk/test/httpserver/test/test_registerdirectory.js index a4b6413ef149..84bb032efc32 100644 --- a/netwerk/test/httpserver/test/test_registerdirectory.js +++ b/netwerk/test/httpserver/test/test_registerdirectory.js @@ -6,7 +6,7 @@ // tests the registerDirectory API -XPCOMUtils.defineLazyGetter(this, "BASE", function () { +ChromeUtils.defineLazyGetter(this, "BASE", function () { return "http://localhost:" + srv.identity.primaryPort; }); @@ -47,7 +47,7 @@ function checkFile(ch, status, data) { ); } -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ /** ********************* * without a base path * diff --git a/netwerk/test/httpserver/test/test_registerfile.js b/netwerk/test/httpserver/test/test_registerfile.js index ab2aee531fab..9b93d62b0780 100644 --- a/netwerk/test/httpserver/test/test_registerfile.js +++ b/netwerk/test/httpserver/test/test_registerfile.js @@ -6,7 +6,7 @@ // tests the registerFile API -XPCOMUtils.defineLazyGetter(this, "BASE", function () { +ChromeUtils.defineLazyGetter(this, "BASE", function () { return "http://localhost:" + srv.identity.primaryPort; }); @@ -21,7 +21,7 @@ function onStop(ch, status, data) { Assert.equal(data.length, file.fileSize); } -XPCOMUtils.defineLazyGetter(this, "test", function () { +ChromeUtils.defineLazyGetter(this, "test", function () { return new Test(BASE + "/foo", null, onStart, onStop); }); diff --git a/netwerk/test/httpserver/test/test_registerprefix.js b/netwerk/test/httpserver/test/test_registerprefix.js index 2accca487092..5edb75225c33 100644 --- a/netwerk/test/httpserver/test/test_registerprefix.js +++ b/netwerk/test/httpserver/test/test_registerprefix.js @@ -6,7 +6,7 @@ // tests the registerPrefixHandler API -XPCOMUtils.defineLazyGetter(this, "BASE", function () { +ChromeUtils.defineLazyGetter(this, "BASE", function () { return "http://localhost:" + srv.identity.primaryPort; }); @@ -28,7 +28,7 @@ function makeCheckOverride(magic) { }; } -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new Test( BASE + "/prefix/dummy", diff --git a/netwerk/test/httpserver/test/test_response_write.js b/netwerk/test/httpserver/test/test_response_write.js index b701c8fa3fb6..7f5837419eb1 100644 --- a/netwerk/test/httpserver/test/test_response_write.js +++ b/netwerk/test/httpserver/test/test_response_write.js @@ -6,7 +6,7 @@ // make sure response.write works for strings, and coerces other args to strings -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new Test( "http://localhost:" + srv.identity.primaryPort + "/writeString", diff --git a/netwerk/test/httpserver/test/test_seizepower.js b/netwerk/test/httpserver/test/test_seizepower.js index 5c21a944241b..a74054ea3759 100644 --- a/netwerk/test/httpserver/test/test_seizepower.js +++ b/netwerk/test/httpserver/test/test_seizepower.js @@ -8,7 +8,7 @@ * Tests that the seizePower API works correctly. */ -XPCOMUtils.defineLazyGetter(this, "PORT", function () { +ChromeUtils.defineLazyGetter(this, "PORT", function () { return srv.identity.primaryPort; }); @@ -136,7 +136,7 @@ function handleSeizeAfterAsync(request, response) { * BEGIN TESTS * ***************/ -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new RawTest("localhost", PORT, data0, checkRawData), new RawTest("localhost", PORT, data1, checkTooLate), diff --git a/netwerk/test/httpserver/test/test_setindexhandler.js b/netwerk/test/httpserver/test/test_setindexhandler.js index 8483fb1a5fa4..e65f565673fe 100644 --- a/netwerk/test/httpserver/test/test_setindexhandler.js +++ b/netwerk/test/httpserver/test/test_setindexhandler.js @@ -18,11 +18,11 @@ function run_test() { runHttpTests(tests, testComplete(srv)); } -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + srv.identity.primaryPort + "/"; }); -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new Test(URL, init, startCustomIndexHandler, stopCustomIndexHandler), new Test(URL, init, startDefaultIndexHandler, stopDefaultIndexHandler), diff --git a/netwerk/test/httpserver/test/test_setstatusline.js b/netwerk/test/httpserver/test/test_setstatusline.js index f27e2b97bbbf..f9cc189a684b 100644 --- a/netwerk/test/httpserver/test/test_setstatusline.js +++ b/netwerk/test/httpserver/test/test_setstatusline.js @@ -7,7 +7,7 @@ // exercise nsIHttpResponse.setStatusLine, ensure its atomicity, and ensure the // specified behavior occurs if it's not called -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + srv.identity.primaryPort; }); @@ -55,7 +55,7 @@ function checkStatusLine( * TESTS * *********/ -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new Test(URL + "/no/setstatusline", null, startNoSetStatusLine, stop), new Test(URL + "/http1_0", null, startHttp1_0, stop), diff --git a/netwerk/test/httpserver/test/test_sjs_object_state.js b/netwerk/test/httpserver/test/test_sjs_object_state.js index 4362dc764183..30c1e5c064c0 100644 --- a/netwerk/test/httpserver/test/test_sjs_object_state.js +++ b/netwerk/test/httpserver/test/test_sjs_object_state.js @@ -8,7 +8,7 @@ * Tests that the object-state-preservation mechanism works correctly. */ -XPCOMUtils.defineLazyGetter(this, "PATH", function () { +ChromeUtils.defineLazyGetter(this, "PATH", function () { return "http://localhost:" + srv.identity.primaryPort + "/object-state.sjs"; }); diff --git a/netwerk/test/httpserver/test/test_sjs_state.js b/netwerk/test/httpserver/test/test_sjs_state.js index d45e750aeaf8..4d1fc37930cd 100644 --- a/netwerk/test/httpserver/test/test_sjs_state.js +++ b/netwerk/test/httpserver/test/test_sjs_state.js @@ -6,7 +6,7 @@ // exercises the server's state-preservation API -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + srv.identity.primaryPort; }); @@ -78,7 +78,7 @@ function pathHandler(request, response) { * BEGIN TESTS * ***************/ -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { return [ new Test( // eslint-disable-next-line no-useless-concat diff --git a/netwerk/test/httpserver/test/test_sjs_throwing_exceptions.js b/netwerk/test/httpserver/test/test_sjs_throwing_exceptions.js index 2f8b73fe528f..8610dcb7fb03 100644 --- a/netwerk/test/httpserver/test/test_sjs_throwing_exceptions.js +++ b/netwerk/test/httpserver/test/test_sjs_throwing_exceptions.js @@ -10,7 +10,7 @@ * then preventing any file from being opened). */ -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + srv.identity.primaryPort; }); @@ -45,7 +45,7 @@ var lastPassed = false; // This hits the open-file limit for me on OS X; your mileage may vary. const TEST_RUNS = 250; -XPCOMUtils.defineLazyGetter(this, "tests", function () { +ChromeUtils.defineLazyGetter(this, "tests", function () { var _tests = new Array(TEST_RUNS + 1); var _test = new Test(URL + "/thrower.sjs?throw", null, start_thrower); for (var i = 0; i < TEST_RUNS; i++) { diff --git a/netwerk/test/httpserver/test/test_start_stop.js b/netwerk/test/httpserver/test/test_start_stop.js index 66b801f4acb6..9dcd7c673a58 100644 --- a/netwerk/test/httpserver/test/test_start_stop.js +++ b/netwerk/test/httpserver/test/test_start_stop.js @@ -8,11 +8,11 @@ * Tests for correct behavior of the server start() and stop() methods. */ -XPCOMUtils.defineLazyGetter(this, "PORT", function () { +ChromeUtils.defineLazyGetter(this, "PORT", function () { return srv.identity.primaryPort; }); -XPCOMUtils.defineLazyGetter(this, "PREPATH", function () { +ChromeUtils.defineLazyGetter(this, "PREPATH", function () { return "http://localhost:" + PORT; }); diff --git a/netwerk/test/httpserver/test/test_start_stop_ipv6.js b/netwerk/test/httpserver/test/test_start_stop_ipv6.js index 6c4b4d99a87e..060605d0e31a 100644 --- a/netwerk/test/httpserver/test/test_start_stop_ipv6.js +++ b/netwerk/test/httpserver/test/test_start_stop_ipv6.js @@ -8,11 +8,11 @@ * Tests for correct behavior of the server start_ipv6() and stop() methods. */ -XPCOMUtils.defineLazyGetter(this, "PORT", function () { +ChromeUtils.defineLazyGetter(this, "PORT", function () { return srv.identity.primaryPort; }); -XPCOMUtils.defineLazyGetter(this, "PREPATH", function () { +ChromeUtils.defineLazyGetter(this, "PREPATH", function () { return "http://localhost:" + PORT; }); diff --git a/netwerk/test/unit/test_304_headers.js b/netwerk/test/unit/test_304_headers.js index 29301b580313..b3583663bfe0 100644 --- a/netwerk/test/unit/test_304_headers.js +++ b/netwerk/test/unit/test_304_headers.js @@ -4,7 +4,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return `http://localhost:${httpServer.identity.primaryPort}/test`; }); diff --git a/netwerk/test/unit/test_304_responses.js b/netwerk/test/unit/test_304_responses.js index 7968ac5c2c8d..a468eec191a9 100644 --- a/netwerk/test/unit/test_304_responses.js +++ b/netwerk/test/unit/test_304_responses.js @@ -5,7 +5,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); @@ -13,7 +13,7 @@ var httpServer = null; const testFileName = "test_customConditionalRequest_304"; const basePath = "/" + testFileName + "/"; -XPCOMUtils.defineLazyGetter(this, "baseURI", function () { +ChromeUtils.defineLazyGetter(this, "baseURI", function () { return URL + basePath; }); diff --git a/netwerk/test/unit/test_307_redirect.js b/netwerk/test/unit/test_307_redirect.js index b489600e1e6d..983884c13454 100644 --- a/netwerk/test/unit/test_307_redirect.js +++ b/netwerk/test/unit/test_307_redirect.js @@ -4,15 +4,15 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); -XPCOMUtils.defineLazyGetter(this, "uri", function () { +ChromeUtils.defineLazyGetter(this, "uri", function () { return URL + "/redirect"; }); -XPCOMUtils.defineLazyGetter(this, "noRedirectURI", function () { +ChromeUtils.defineLazyGetter(this, "noRedirectURI", function () { return URL + "/content"; }); diff --git a/netwerk/test/unit/test_421.js b/netwerk/test/unit/test_421.js index cbcdccaebfe3..680973384e4e 100644 --- a/netwerk/test/unit/test_421.js +++ b/netwerk/test/unit/test_421.js @@ -4,7 +4,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_SuperfluousAuth.js b/netwerk/test/unit/test_SuperfluousAuth.js index 65d0fcbf3fba..5d9d3830acec 100644 --- a/netwerk/test/unit/test_SuperfluousAuth.js +++ b/netwerk/test/unit/test_SuperfluousAuth.js @@ -21,7 +21,7 @@ var httpProtocolHandler = Cc[ "@mozilla.org/network/protocol;1?name=http" ].getService(Ci.nsIHttpProtocolHandler); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://foo@localhost:" + httpServer.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_XHR_redirects.js b/netwerk/test/unit/test_XHR_redirects.js index 02e439e3acad..e3bee4c76ff6 100644 --- a/netwerk/test/unit/test_XHR_redirects.js +++ b/netwerk/test/unit/test_XHR_redirects.js @@ -19,10 +19,10 @@ var sRedirectPromptPref; const BUGID = "676059"; const OTHERBUGID = "696849"; -XPCOMUtils.defineLazyGetter(this, "pSame", function () { +ChromeUtils.defineLazyGetter(this, "pSame", function () { return sSame.identity.primaryPort; }); -XPCOMUtils.defineLazyGetter(this, "pOther", function () { +ChromeUtils.defineLazyGetter(this, "pOther", function () { return sOther.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_alt-data_closeWithStatus.js b/netwerk/test/unit/test_alt-data_closeWithStatus.js index 6e259262922c..df81419cc2b9 100644 --- a/netwerk/test/unit/test_alt-data_closeWithStatus.js +++ b/netwerk/test/unit/test_alt-data_closeWithStatus.js @@ -16,7 +16,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort + "/content"; }); diff --git a/netwerk/test/unit/test_alt-data_cross_process.js b/netwerk/test/unit/test_alt-data_cross_process.js index 7529ffc0c0d3..e46120f312dd 100644 --- a/netwerk/test/unit/test_alt-data_cross_process.js +++ b/netwerk/test/unit/test_alt-data_cross_process.js @@ -15,7 +15,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort + "/content"; }); diff --git a/netwerk/test/unit/test_alt-data_overwrite.js b/netwerk/test/unit/test_alt-data_overwrite.js index 684fb1c88d0e..3a3c1964d26e 100644 --- a/netwerk/test/unit/test_alt-data_overwrite.js +++ b/netwerk/test/unit/test_alt-data_overwrite.js @@ -18,7 +18,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort + "/content"; }); diff --git a/netwerk/test/unit/test_alt-data_simple.js b/netwerk/test/unit/test_alt-data_simple.js index 8db9807afdfd..d648884e7ab8 100644 --- a/netwerk/test/unit/test_alt-data_simple.js +++ b/netwerk/test/unit/test_alt-data_simple.js @@ -15,7 +15,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort + "/content"; }); diff --git a/netwerk/test/unit/test_alt-data_stream.js b/netwerk/test/unit/test_alt-data_stream.js index 3399f0b9cfa3..9b6bfd050aa1 100644 --- a/netwerk/test/unit/test_alt-data_stream.js +++ b/netwerk/test/unit/test_alt-data_stream.js @@ -17,7 +17,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort + "/content"; }); diff --git a/netwerk/test/unit/test_auth_dialog_permission.js b/netwerk/test/unit/test_auth_dialog_permission.js index 8090ababf783..a45b65158895 100644 --- a/netwerk/test/unit/test_auth_dialog_permission.js +++ b/netwerk/test/unit/test_auth_dialog_permission.js @@ -49,7 +49,7 @@ var httpserv = new HttpServer(); httpserv.registerPathHandler("/auth", authHandler); httpserv.start(-1); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserv.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_auth_multiple.js b/netwerk/test/unit/test_auth_multiple.js index e67dce87cc4d..d4cc1611f320 100644 --- a/netwerk/test/unit/test_auth_multiple.js +++ b/netwerk/test/unit/test_auth_multiple.js @@ -18,7 +18,7 @@ function URL(domain, path = "") { return `http://${domain}:${httpserv.identity.primaryPort}/${path}`; } -XPCOMUtils.defineLazyGetter(this, "PORT", function () { +ChromeUtils.defineLazyGetter(this, "PORT", function () { return httpserv.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_authentication.js b/netwerk/test/unit/test_authentication.js index ed9060097de1..ae477dd65c0e 100644 --- a/netwerk/test/unit/test_authentication.js +++ b/netwerk/test/unit/test_authentication.js @@ -10,11 +10,11 @@ const { HttpServer } = ChromeUtils.importESModule( // Turn off the authentication dialog blocking for this test. Services.prefs.setIntPref("network.auth.subresource-http-auth-allow", 2); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserv.identity.primaryPort; }); -XPCOMUtils.defineLazyGetter(this, "PORT", function () { +ChromeUtils.defineLazyGetter(this, "PORT", function () { return httpserv.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_brotli_http.js b/netwerk/test/unit/test_brotli_http.js index 39181b6eecb1..0ceb1dbef9db 100644 --- a/netwerk/test/unit/test_brotli_http.js +++ b/netwerk/test/unit/test_brotli_http.js @@ -13,7 +13,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort + "/content"; }); diff --git a/netwerk/test/unit/test_brotli_unknown_content_type.js b/netwerk/test/unit/test_brotli_unknown_content_type.js index fc81ff9bfbaa..7df0d4f84771 100644 --- a/netwerk/test/unit/test_brotli_unknown_content_type.js +++ b/netwerk/test/unit/test_brotli_unknown_content_type.js @@ -21,13 +21,13 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL_EMPTY_BROTLI", function () { +ChromeUtils.defineLazyGetter(this, "URL_EMPTY_BROTLI", function () { return ( "http://localhost:" + httpServer.identity.primaryPort + "/empty-brotli" ); }); -XPCOMUtils.defineLazyGetter(this, "URL_LARGE_EMPTY_BROTLI", function () { +ChromeUtils.defineLazyGetter(this, "URL_LARGE_EMPTY_BROTLI", function () { return ( "http://localhost:" + httpServer.identity.primaryPort + diff --git a/netwerk/test/unit/test_bug1064258.js b/netwerk/test/unit/test_bug1064258.js index 3b265853bf47..9be44254b5fd 100644 --- a/netwerk/test/unit/test_bug1064258.js +++ b/netwerk/test/unit/test_bug1064258.js @@ -16,7 +16,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_bug1177909.js b/netwerk/test/unit/test_bug1177909.js index 4b56e58f051a..0fc94f8a2cf5 100644 --- a/netwerk/test/unit/test_bug1177909.js +++ b/netwerk/test/unit/test_bug1177909.js @@ -11,7 +11,7 @@ XPCOMUtils.defineLazyServiceGetter( "nsIProtocolProxyService" ); -XPCOMUtils.defineLazyGetter(this, "systemSettings", function () { +ChromeUtils.defineLazyGetter(this, "systemSettings", function () { return { QueryInterface: ChromeUtils.generateQI(["nsISystemProxySettings"]), diff --git a/netwerk/test/unit/test_bug1527293.js b/netwerk/test/unit/test_bug1527293.js index 72530607db7a..bed2bddec6c0 100644 --- a/netwerk/test/unit/test_bug1527293.js +++ b/netwerk/test/unit/test_bug1527293.js @@ -19,7 +19,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_bug1683176.js b/netwerk/test/unit/test_bug1683176.js index 386e6f594e4d..9b0fddf7bd28 100644 --- a/netwerk/test/unit/test_bug1683176.js +++ b/netwerk/test/unit/test_bug1683176.js @@ -14,7 +14,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserv.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_bug528292.js b/netwerk/test/unit/test_bug528292.js index 1a0706748bfb..84449aff71b6 100644 --- a/netwerk/test/unit/test_bug528292.js +++ b/netwerk/test/unit/test_bug528292.js @@ -7,19 +7,19 @@ const { HttpServer } = ChromeUtils.importESModule( const sentCookieVal = "foo=bar"; const responseBody = "response body"; -XPCOMUtils.defineLazyGetter(this, "baseURL", function () { +ChromeUtils.defineLazyGetter(this, "baseURL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); const preRedirectPath = "/528292/pre-redirect"; -XPCOMUtils.defineLazyGetter(this, "preRedirectURL", function () { +ChromeUtils.defineLazyGetter(this, "preRedirectURL", function () { return baseURL + preRedirectPath; }); const postRedirectPath = "/528292/post-redirect"; -XPCOMUtils.defineLazyGetter(this, "postRedirectURL", function () { +ChromeUtils.defineLazyGetter(this, "postRedirectURL", function () { return baseURL + postRedirectPath; }); diff --git a/netwerk/test/unit/test_bug586908.js b/netwerk/test/unit/test_bug586908.js index 20f29176edf8..1d3ab203470a 100644 --- a/netwerk/test/unit/test_bug586908.js +++ b/netwerk/test/unit/test_bug586908.js @@ -9,7 +9,7 @@ const { MockRegistrar } = ChromeUtils.importESModule( var httpserv = null; -XPCOMUtils.defineLazyGetter(this, "systemSettings", function () { +ChromeUtils.defineLazyGetter(this, "systemSettings", function () { return { QueryInterface: ChromeUtils.generateQI(["nsISystemProxySettings"]), diff --git a/netwerk/test/unit/test_bug667907.js b/netwerk/test/unit/test_bug667907.js index d52108a0fe37..5c6b13d5380b 100644 --- a/netwerk/test/unit/test_bug667907.js +++ b/netwerk/test/unit/test_bug667907.js @@ -9,11 +9,11 @@ var simplePath = "/simple"; var normalPath = "/normal"; var httpbody = ""; -XPCOMUtils.defineLazyGetter(this, "uri1", function () { +ChromeUtils.defineLazyGetter(this, "uri1", function () { return "http://localhost:" + httpserver.identity.primaryPort + simplePath; }); -XPCOMUtils.defineLazyGetter(this, "uri2", function () { +ChromeUtils.defineLazyGetter(this, "uri2", function () { return "http://localhost:" + httpserver.identity.primaryPort + normalPath; }); diff --git a/netwerk/test/unit/test_bug669001.js b/netwerk/test/unit/test_bug669001.js index de012676169f..ebd5998cf1d9 100644 --- a/netwerk/test/unit/test_bug669001.js +++ b/netwerk/test/unit/test_bug669001.js @@ -7,7 +7,7 @@ const { HttpServer } = ChromeUtils.importESModule( var httpServer = null; var path = "/bug699001"; -XPCOMUtils.defineLazyGetter(this, "URI", function () { +ChromeUtils.defineLazyGetter(this, "URI", function () { return "http://localhost:" + httpServer.identity.primaryPort + path; }); diff --git a/netwerk/test/unit/test_bug812167.js b/netwerk/test/unit/test_bug812167.js index fe2d571649b8..8728f1bb507a 100644 --- a/netwerk/test/unit/test_bug812167.js +++ b/netwerk/test/unit/test_bug812167.js @@ -15,13 +15,13 @@ var httpserver = null; // Need to randomize, because apparently no one clears our cache var randomPath1 = "/redirect-no-store/" + Math.random(); -XPCOMUtils.defineLazyGetter(this, "randomURI1", function () { +ChromeUtils.defineLazyGetter(this, "randomURI1", function () { return "http://localhost:" + httpserver.identity.primaryPort + randomPath1; }); var randomPath2 = "/redirect-expires-past/" + Math.random(); -XPCOMUtils.defineLazyGetter(this, "randomURI2", function () { +ChromeUtils.defineLazyGetter(this, "randomURI2", function () { return "http://localhost:" + httpserver.identity.primaryPort + randomPath2; }); diff --git a/netwerk/test/unit/test_cache-entry-id.js b/netwerk/test/unit/test_cache-entry-id.js index 68b01ea94f6f..f0011de47fe6 100644 --- a/netwerk/test/unit/test_cache-entry-id.js +++ b/netwerk/test/unit/test_cache-entry-id.js @@ -8,7 +8,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort + "/content"; }); diff --git a/netwerk/test/unit/test_cache2-29a-concurrent_read_resumable_entry_size_zero.js b/netwerk/test/unit/test_cache2-29a-concurrent_read_resumable_entry_size_zero.js index e457a4151f5b..b97c4b113cd7 100644 --- a/netwerk/test/unit/test_cache2-29a-concurrent_read_resumable_entry_size_zero.js +++ b/netwerk/test/unit/test_cache2-29a-concurrent_read_resumable_entry_size_zero.js @@ -21,7 +21,7 @@ var httpProtocolHandler = Cc[ "@mozilla.org/network/protocol;1?name=http" ].getService(Ci.nsIHttpProtocolHandler); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_cache2-29b-concurrent_read_non-resumable_entry_size_zero.js b/netwerk/test/unit/test_cache2-29b-concurrent_read_non-resumable_entry_size_zero.js index e0e1dfb987a2..e221be7661e0 100644 --- a/netwerk/test/unit/test_cache2-29b-concurrent_read_non-resumable_entry_size_zero.js +++ b/netwerk/test/unit/test_cache2-29b-concurrent_read_non-resumable_entry_size_zero.js @@ -23,7 +23,7 @@ var httpProtocolHandler = Cc[ "@mozilla.org/network/protocol;1?name=http" ].getService(Ci.nsIHttpProtocolHandler); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_cache2-29c-concurrent_read_half-interrupted.js b/netwerk/test/unit/test_cache2-29c-concurrent_read_half-interrupted.js index 3497359b3d75..706ad894ca5c 100644 --- a/netwerk/test/unit/test_cache2-29c-concurrent_read_half-interrupted.js +++ b/netwerk/test/unit/test_cache2-29c-concurrent_read_half-interrupted.js @@ -23,7 +23,7 @@ var httpProtocolHandler = Cc[ "@mozilla.org/network/protocol;1?name=http" ].getService(Ci.nsIHttpProtocolHandler); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_cache2-29d-concurrent_read_half-corrupted-206.js b/netwerk/test/unit/test_cache2-29d-concurrent_read_half-corrupted-206.js index bffddf88a27a..d9886a6fbfbc 100644 --- a/netwerk/test/unit/test_cache2-29d-concurrent_read_half-corrupted-206.js +++ b/netwerk/test/unit/test_cache2-29d-concurrent_read_half-corrupted-206.js @@ -23,7 +23,7 @@ var httpProtocolHandler = Cc[ "@mozilla.org/network/protocol;1?name=http" ].getService(Ci.nsIHttpProtocolHandler); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_cache2-29e-concurrent_read_half-non-206-response.js b/netwerk/test/unit/test_cache2-29e-concurrent_read_half-non-206-response.js index a8055fe69934..7d517d518dae 100644 --- a/netwerk/test/unit/test_cache2-29e-concurrent_read_half-non-206-response.js +++ b/netwerk/test/unit/test_cache2-29e-concurrent_read_half-non-206-response.js @@ -23,7 +23,7 @@ var httpProtocolHandler = Cc[ "@mozilla.org/network/protocol;1?name=http" ].getService(Ci.nsIHttpProtocolHandler); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_cache_jar.js b/netwerk/test/unit/test_cache_jar.js index 348230d182fe..bedde668b481 100644 --- a/netwerk/test/unit/test_cache_jar.js +++ b/netwerk/test/unit/test_cache_jar.js @@ -4,7 +4,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserv.identity.primaryPort + "/cached"; }); diff --git a/netwerk/test/unit/test_captive_portal_service.js b/netwerk/test/unit/test_captive_portal_service.js index ed01c487db65..d5c951d16c3b 100644 --- a/netwerk/test/unit/test_captive_portal_service.js +++ b/netwerk/test/unit/test_captive_portal_service.js @@ -5,7 +5,7 @@ const { HttpServer } = ChromeUtils.importESModule( ); let httpserver = null; -XPCOMUtils.defineLazyGetter(this, "cpURI", function () { +ChromeUtils.defineLazyGetter(this, "cpURI", function () { return ( "http://localhost:" + httpserver.identity.primaryPort + "/captive.html" ); diff --git a/netwerk/test/unit/test_channel_close.js b/netwerk/test/unit/test_channel_close.js index b1b8a5372bd2..f8f78fd211e4 100644 --- a/netwerk/test/unit/test_channel_close.js +++ b/netwerk/test/unit/test_channel_close.js @@ -8,7 +8,7 @@ var httpProtocolHandler = Cc[ "@mozilla.org/network/protocol;1?name=http" ].getService(Ci.nsIHttpProtocolHandler); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_chunked_responses.js b/netwerk/test/unit/test_chunked_responses.js index d6b5452a18b1..c8dee14efe08 100644 --- a/netwerk/test/unit/test_chunked_responses.js +++ b/netwerk/test/unit/test_chunked_responses.js @@ -15,7 +15,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_content_length_underrun.js b/netwerk/test/unit/test_content_length_underrun.js index 43f45ee3836e..f5f8e40a8afc 100644 --- a/netwerk/test/unit/test_content_length_underrun.js +++ b/netwerk/test/unit/test_content_length_underrun.js @@ -11,7 +11,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_cookie_header.js b/netwerk/test/unit/test_cookie_header.js index 6062b8dc2b74..a5326ef25c81 100644 --- a/netwerk/test/unit/test_cookie_header.js +++ b/netwerk/test/unit/test_cookie_header.js @@ -6,7 +6,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserv.identity.primaryPort + "/"; }); diff --git a/netwerk/test/unit/test_cookie_ipv6.js b/netwerk/test/unit/test_cookie_ipv6.js index 69f65991eae7..a91b8a68484c 100644 --- a/netwerk/test/unit/test_cookie_ipv6.js +++ b/netwerk/test/unit/test_cookie_ipv6.js @@ -10,7 +10,7 @@ "use strict"; let ip = "[::1]"; -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return `http://${ip}:${httpserver.identity.primaryPort}/`; }); diff --git a/netwerk/test/unit/test_cookiejars.js b/netwerk/test/unit/test_cookiejars.js index be323cfac30b..1d78893f8cc3 100644 --- a/netwerk/test/unit/test_cookiejars.js +++ b/netwerk/test/unit/test_cookiejars.js @@ -9,7 +9,7 @@ "use strict"; -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_cookiejars_safebrowsing.js b/netwerk/test/unit/test_cookiejars_safebrowsing.js index 763f82e0d9f3..855bacef42c4 100644 --- a/netwerk/test/unit/test_cookiejars_safebrowsing.js +++ b/netwerk/test/unit/test_cookiejars_safebrowsing.js @@ -29,7 +29,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_dns_retry.js b/netwerk/test/unit/test_dns_retry.js index 2943c3badf05..8cbd82d909f1 100644 --- a/netwerk/test/unit/test_dns_retry.js +++ b/netwerk/test/unit/test_dns_retry.js @@ -13,16 +13,16 @@ let CC_IPV4 = "example_cc_ipv4.com"; let CC_IPV6 = "example_cc_ipv6.com"; Services.prefs.clearUserPref("network.dns.native-is-localhost"); -XPCOMUtils.defineLazyGetter(this, "URL_CC_IPV4", function () { +ChromeUtils.defineLazyGetter(this, "URL_CC_IPV4", function () { return `http://${CC_IPV4}:${httpServerIPv4.identity.primaryPort}${testpath}`; }); -XPCOMUtils.defineLazyGetter(this, "URL_CC_IPV6", function () { +ChromeUtils.defineLazyGetter(this, "URL_CC_IPV6", function () { return `http://${CC_IPV6}:${httpServerIPv6.identity.primaryPort}${testpath}`; }); -XPCOMUtils.defineLazyGetter(this, "URL6a", function () { +ChromeUtils.defineLazyGetter(this, "URL6a", function () { return `http://example6a.com:${httpServerIPv6.identity.primaryPort}${testpath}`; }); -XPCOMUtils.defineLazyGetter(this, "URL6b", function () { +ChromeUtils.defineLazyGetter(this, "URL6b", function () { return `http://example6b.com:${httpServerIPv6.identity.primaryPort}${testpath}`; }); diff --git a/netwerk/test/unit/test_duplicate_headers.js b/netwerk/test/unit/test_duplicate_headers.js index 9f9f601c3675..78d2355d1ed1 100644 --- a/netwerk/test/unit/test_duplicate_headers.js +++ b/netwerk/test/unit/test_duplicate_headers.js @@ -16,7 +16,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_event_sink.js b/netwerk/test/unit/test_event_sink.js index 71c47fb11ff0..e49080c88cc4 100644 --- a/netwerk/test/unit/test_event_sink.js +++ b/netwerk/test/unit/test_event_sink.js @@ -6,7 +6,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserv.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_head.js b/netwerk/test/unit/test_head.js index 57a27f0387b4..8a6b2a5cd7ce 100644 --- a/netwerk/test/unit/test_head.js +++ b/netwerk/test/unit/test_head.js @@ -15,7 +15,7 @@ const ReferrerInfo = Components.Constructor( "init" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_headers.js b/netwerk/test/unit/test_headers.js index 8e8c6006c41f..e1439c6c4335 100644 --- a/netwerk/test/unit/test_headers.js +++ b/netwerk/test/unit/test_headers.js @@ -27,7 +27,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_httpsuspend.js b/netwerk/test/unit/test_httpsuspend.js index a3b9e1c7d70b..581caf906e6c 100644 --- a/netwerk/test/unit/test_httpsuspend.js +++ b/netwerk/test/unit/test_httpsuspend.js @@ -7,7 +7,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserv.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_inhibit_caching.js b/netwerk/test/unit/test_inhibit_caching.js index 6f3fc76ba296..330e0f632f25 100644 --- a/netwerk/test/unit/test_inhibit_caching.js +++ b/netwerk/test/unit/test_inhibit_caching.js @@ -15,7 +15,7 @@ function contentHandler(metadata, response) { response.bodyOutputStream.write(body, body.length); } -XPCOMUtils.defineLazyGetter(this, "uri", function () { +ChromeUtils.defineLazyGetter(this, "uri", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_mismatch_last-modified.js b/netwerk/test/unit/test_mismatch_last-modified.js index e0f994d00f64..010d5d117889 100644 --- a/netwerk/test/unit/test_mismatch_last-modified.js +++ b/netwerk/test/unit/test_mismatch_last-modified.js @@ -45,7 +45,7 @@ var listener_3 = { }, }; -XPCOMUtils.defineLazyGetter(this, "listener_2", function () { +ChromeUtils.defineLazyGetter(this, "listener_2", function () { return { // this listener is used to process the revalidation of the // corrupted cache entry. its revalidation prompts it to be cleaned @@ -77,7 +77,7 @@ XPCOMUtils.defineLazyGetter(this, "listener_2", function () { }; }); -XPCOMUtils.defineLazyGetter(this, "listener_1", function () { +ChromeUtils.defineLazyGetter(this, "listener_1", function () { return { // this listener processes the initial request from a empty cache. // the server responds with the wrong data ('A') diff --git a/netwerk/test/unit/test_multipart_byteranges.js b/netwerk/test/unit/test_multipart_byteranges.js index 88864de4a5a2..475aced456a3 100644 --- a/netwerk/test/unit/test_multipart_byteranges.js +++ b/netwerk/test/unit/test_multipart_byteranges.js @@ -6,7 +6,7 @@ const { HttpServer } = ChromeUtils.importESModule( var httpserver = null; -XPCOMUtils.defineLazyGetter(this, "uri", function () { +ChromeUtils.defineLazyGetter(this, "uri", function () { return "http://localhost:" + httpserver.identity.primaryPort + "/multipart"; }); diff --git a/netwerk/test/unit/test_multipart_streamconv-byte-by-byte.js b/netwerk/test/unit/test_multipart_streamconv-byte-by-byte.js index 5d125d24e711..c1865f566805 100644 --- a/netwerk/test/unit/test_multipart_streamconv-byte-by-byte.js +++ b/netwerk/test/unit/test_multipart_streamconv-byte-by-byte.js @@ -6,7 +6,7 @@ const { HttpServer } = ChromeUtils.importESModule( var httpserver = null; -XPCOMUtils.defineLazyGetter(this, "uri", function () { +ChromeUtils.defineLazyGetter(this, "uri", function () { return "http://localhost:" + httpserver.identity.primaryPort + "/multipart"; }); diff --git a/netwerk/test/unit/test_multipart_streamconv.js b/netwerk/test/unit/test_multipart_streamconv.js index f1d42b0d8f64..c1503e4d8c0c 100644 --- a/netwerk/test/unit/test_multipart_streamconv.js +++ b/netwerk/test/unit/test_multipart_streamconv.js @@ -6,7 +6,7 @@ const { HttpServer } = ChromeUtils.importESModule( var httpserver = null; -XPCOMUtils.defineLazyGetter(this, "uri", function () { +ChromeUtils.defineLazyGetter(this, "uri", function () { return "http://localhost:" + httpserver.identity.primaryPort + "/multipart"; }); diff --git a/netwerk/test/unit/test_multipart_streamconv_missing_boundary_lead_dashes.js b/netwerk/test/unit/test_multipart_streamconv_missing_boundary_lead_dashes.js index cb78a5f66c17..3ed2bd39c6ba 100644 --- a/netwerk/test/unit/test_multipart_streamconv_missing_boundary_lead_dashes.js +++ b/netwerk/test/unit/test_multipart_streamconv_missing_boundary_lead_dashes.js @@ -6,7 +6,7 @@ const { HttpServer } = ChromeUtils.importESModule( var httpserver = null; -XPCOMUtils.defineLazyGetter(this, "uri", function () { +ChromeUtils.defineLazyGetter(this, "uri", function () { return "http://localhost:" + httpserver.identity.primaryPort + "/multipart"; }); diff --git a/netwerk/test/unit/test_multipart_streamconv_missing_lead_boundary.js b/netwerk/test/unit/test_multipart_streamconv_missing_lead_boundary.js index 6f28a32be270..1df4311b906f 100644 --- a/netwerk/test/unit/test_multipart_streamconv_missing_lead_boundary.js +++ b/netwerk/test/unit/test_multipart_streamconv_missing_lead_boundary.js @@ -6,7 +6,7 @@ const { HttpServer } = ChromeUtils.importESModule( var httpserver = null; -XPCOMUtils.defineLazyGetter(this, "uri", function () { +ChromeUtils.defineLazyGetter(this, "uri", function () { return "http://localhost:" + httpserver.identity.primaryPort + "/multipart"; }); diff --git a/netwerk/test/unit/test_network_connectivity_service.js b/netwerk/test/unit/test_network_connectivity_service.js index a39ef1337bdf..971b01f0dbc3 100644 --- a/netwerk/test/unit/test_network_connectivity_service.js +++ b/netwerk/test/unit/test_network_connectivity_service.js @@ -37,11 +37,11 @@ registerCleanupFunction(() => { let httpserver = null; let httpserverv6 = null; -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort + "/content"; }); -XPCOMUtils.defineLazyGetter(this, "URLv6", function () { +ChromeUtils.defineLazyGetter(this, "URLv6", function () { return "http://[::1]:" + httpserverv6.identity.primaryPort + "/content"; }); diff --git a/netwerk/test/unit/test_ntlm_authentication.js b/netwerk/test/unit/test_ntlm_authentication.js index 1196a06b21e6..6afa55769238 100644 --- a/netwerk/test/unit/test_ntlm_authentication.js +++ b/netwerk/test/unit/test_ntlm_authentication.js @@ -11,11 +11,11 @@ const { HttpServer } = ChromeUtils.importESModule( var prefs = Services.prefs; prefs.setIntPref("network.auth.subresource-http-auth-allow", 2); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserv.identity.primaryPort; }); -XPCOMUtils.defineLazyGetter(this, "PORT", function () { +ChromeUtils.defineLazyGetter(this, "PORT", function () { return httpserv.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_ntlm_proxy_and_web_auth.js b/netwerk/test/unit/test_ntlm_proxy_and_web_auth.js index f5c0d127e54b..343583927504 100644 --- a/netwerk/test/unit/test_ntlm_proxy_and_web_auth.js +++ b/netwerk/test/unit/test_ntlm_proxy_and_web_auth.js @@ -11,7 +11,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_ntlm_proxy_auth.js b/netwerk/test/unit/test_ntlm_proxy_auth.js index fa9bba0f98a9..ec77e6579064 100644 --- a/netwerk/test/unit/test_ntlm_proxy_auth.js +++ b/netwerk/test/unit/test_ntlm_proxy_auth.js @@ -10,7 +10,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_ntlm_web_auth.js b/netwerk/test/unit/test_ntlm_web_auth.js index 9ae90e6c9dfb..1325477bc666 100644 --- a/netwerk/test/unit/test_ntlm_web_auth.js +++ b/netwerk/test/unit/test_ntlm_web_auth.js @@ -10,7 +10,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_original_sent_received_head.js b/netwerk/test/unit/test_original_sent_received_head.js index 54ebae61e12a..744528b832b9 100644 --- a/netwerk/test/unit/test_original_sent_received_head.js +++ b/netwerk/test/unit/test_original_sent_received_head.js @@ -19,7 +19,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_partial_response_entry_size_smart_shrink.js b/netwerk/test/unit/test_partial_response_entry_size_smart_shrink.js index b539eb94b9b1..0dd5482708e1 100644 --- a/netwerk/test/unit/test_partial_response_entry_size_smart_shrink.js +++ b/netwerk/test/unit/test_partial_response_entry_size_smart_shrink.js @@ -13,7 +13,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_post.js b/netwerk/test/unit/test_post.js index d0b368694d4e..f57a14992012 100644 --- a/netwerk/test/unit/test_post.js +++ b/netwerk/test/unit/test_post.js @@ -8,7 +8,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_progress.js b/netwerk/test/unit/test_progress.js index 1fb5ada3c8dc..8363f0e337ac 100644 --- a/netwerk/test/unit/test_progress.js +++ b/netwerk/test/unit/test_progress.js @@ -4,7 +4,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_rcwn_interrupted.js b/netwerk/test/unit/test_rcwn_interrupted.js index 28d8581fb5c8..5f3d059999f5 100644 --- a/netwerk/test/unit/test_rcwn_interrupted.js +++ b/netwerk/test/unit/test_rcwn_interrupted.js @@ -23,7 +23,7 @@ var httpProtocolHandler = Cc[ "@mozilla.org/network/protocol;1?name=http" ].getService(Ci.nsIHttpProtocolHandler); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_redirect-caching_canceled.js b/netwerk/test/unit/test_redirect-caching_canceled.js index d89351fcc11e..0ecf2f74b7e5 100644 --- a/netwerk/test/unit/test_redirect-caching_canceled.js +++ b/netwerk/test/unit/test_redirect-caching_canceled.js @@ -4,7 +4,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); @@ -12,7 +12,7 @@ var httpServer = null; // Need to randomize, because apparently no one clears our cache var randomPath = "/redirect/" + Math.random(); -XPCOMUtils.defineLazyGetter(this, "randomURI", function () { +ChromeUtils.defineLazyGetter(this, "randomURI", function () { return URL + randomPath; }); diff --git a/netwerk/test/unit/test_redirect-caching_failure.js b/netwerk/test/unit/test_redirect-caching_failure.js index ccd06d343864..2f8105dd94d0 100644 --- a/netwerk/test/unit/test_redirect-caching_failure.js +++ b/netwerk/test/unit/test_redirect-caching_failure.js @@ -16,7 +16,7 @@ function inChildProcess() { return Services.appinfo.processType != Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT; } -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); @@ -24,7 +24,7 @@ var httpServer = null; // Need to randomize, because apparently no one clears our cache var randomPath = "/redirect/" + Math.random(); -XPCOMUtils.defineLazyGetter(this, "randomURI", function () { +ChromeUtils.defineLazyGetter(this, "randomURI", function () { return URL + randomPath; }); diff --git a/netwerk/test/unit/test_redirect-caching_passing.js b/netwerk/test/unit/test_redirect-caching_passing.js index 8893536c47bb..0e6616f4937c 100644 --- a/netwerk/test/unit/test_redirect-caching_passing.js +++ b/netwerk/test/unit/test_redirect-caching_passing.js @@ -4,7 +4,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); @@ -12,7 +12,7 @@ var httpserver = null; // Need to randomize, because apparently no one clears our cache var randomPath = "/redirect/" + Math.random(); -XPCOMUtils.defineLazyGetter(this, "randomURI", function () { +ChromeUtils.defineLazyGetter(this, "randomURI", function () { return URL + randomPath; }); diff --git a/netwerk/test/unit/test_redirect_baduri.js b/netwerk/test/unit/test_redirect_baduri.js index 4dff3588cfa2..f83c9a264f6a 100644 --- a/netwerk/test/unit/test_redirect_baduri.js +++ b/netwerk/test/unit/test_redirect_baduri.js @@ -11,7 +11,7 @@ const { HttpServer } = ChromeUtils.importESModule( var httpServer = null; var BadRedirectPath = "/BadRedirect"; -XPCOMUtils.defineLazyGetter(this, "BadRedirectURI", function () { +ChromeUtils.defineLazyGetter(this, "BadRedirectURI", function () { return ( "http://localhost:" + httpServer.identity.primaryPort + BadRedirectPath ); diff --git a/netwerk/test/unit/test_redirect_canceled.js b/netwerk/test/unit/test_redirect_canceled.js index 355b1cab448f..9eb9d8b33a8e 100644 --- a/netwerk/test/unit/test_redirect_canceled.js +++ b/netwerk/test/unit/test_redirect_canceled.js @@ -4,7 +4,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); @@ -12,7 +12,7 @@ var httpServer = null; // Need to randomize, because apparently no one clears our cache var randomPath = "/redirect/" + Math.random(); -XPCOMUtils.defineLazyGetter(this, "randomURI", function () { +ChromeUtils.defineLazyGetter(this, "randomURI", function () { return URL + randomPath; }); diff --git a/netwerk/test/unit/test_redirect_different-protocol.js b/netwerk/test/unit/test_redirect_different-protocol.js index ae0531864bff..78b305c84eb8 100644 --- a/netwerk/test/unit/test_redirect_different-protocol.js +++ b/netwerk/test/unit/test_redirect_different-protocol.js @@ -4,7 +4,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); @@ -12,7 +12,7 @@ var httpServer = null; // Need to randomize, because apparently no one clears our cache var randomPath = "/redirect/" + Math.random(); -XPCOMUtils.defineLazyGetter(this, "randomURI", function () { +ChromeUtils.defineLazyGetter(this, "randomURI", function () { return URL + randomPath; }); diff --git a/netwerk/test/unit/test_redirect_failure.js b/netwerk/test/unit/test_redirect_failure.js index 5a96125aea60..28b466858074 100644 --- a/netwerk/test/unit/test_redirect_failure.js +++ b/netwerk/test/unit/test_redirect_failure.js @@ -15,7 +15,7 @@ function inChildProcess() { return Services.appinfo.processType != Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT; } -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); @@ -23,7 +23,7 @@ var httpServer = null; // Need to randomize, because apparently no one clears our cache var randomPath = "/redirect/" + Math.random(); -XPCOMUtils.defineLazyGetter(this, "randomURI", function () { +ChromeUtils.defineLazyGetter(this, "randomURI", function () { return URL + randomPath; }); diff --git a/netwerk/test/unit/test_redirect_from_script.js b/netwerk/test/unit/test_redirect_from_script.js index a05886bf4109..0c42d66b6401 100644 --- a/netwerk/test/unit/test_redirect_from_script.js +++ b/netwerk/test/unit/test_redirect_from_script.js @@ -35,24 +35,24 @@ let redirectHook = "http-on-modify-request"; var httpServer = null, httpServer2 = null; -XPCOMUtils.defineLazyGetter(this, "port1", function () { +ChromeUtils.defineLazyGetter(this, "port1", function () { return httpServer.identity.primaryPort; }); -XPCOMUtils.defineLazyGetter(this, "port2", function () { +ChromeUtils.defineLazyGetter(this, "port2", function () { return httpServer2.identity.primaryPort; }); // Test Part 1: a cross-path redirect on a single HTTP server // http://localhost:port1/bait -> http://localhost:port1/switch var baitPath = "/bait"; -XPCOMUtils.defineLazyGetter(this, "baitURI", function () { +ChromeUtils.defineLazyGetter(this, "baitURI", function () { return "http://localhost:" + port1 + baitPath; }); var baitText = "you got the worm"; var redirectedPath = "/switch"; -XPCOMUtils.defineLazyGetter(this, "redirectedURI", function () { +ChromeUtils.defineLazyGetter(this, "redirectedURI", function () { return "http://localhost:" + port1 + redirectedPath; }); var redirectedText = "worms are not tasty"; @@ -60,25 +60,25 @@ var redirectedText = "worms are not tasty"; // Test Part 2: Now, a redirect to a different server // http://localhost:port1/bait2 -> http://localhost:port2/switch var bait2Path = "/bait2"; -XPCOMUtils.defineLazyGetter(this, "bait2URI", function () { +ChromeUtils.defineLazyGetter(this, "bait2URI", function () { return "http://localhost:" + port1 + bait2Path; }); -XPCOMUtils.defineLazyGetter(this, "redirected2URI", function () { +ChromeUtils.defineLazyGetter(this, "redirected2URI", function () { return "http://localhost:" + port2 + redirectedPath; }); // Test Part 3, begin with a serverside redirect that itself turns into an instance // of Test Part 1 var bait3Path = "/bait3"; -XPCOMUtils.defineLazyGetter(this, "bait3URI", function () { +ChromeUtils.defineLazyGetter(this, "bait3URI", function () { return "http://localhost:" + port1 + bait3Path; }); // Test Part 4, begin with this client-side redirect and which then redirects // to an instance of Test Part 1 var bait4Path = "/bait4"; -XPCOMUtils.defineLazyGetter(this, "bait4URI", function () { +ChromeUtils.defineLazyGetter(this, "bait4URI", function () { return "http://localhost:" + port1 + bait4Path; }); diff --git a/netwerk/test/unit/test_redirect_from_script_after-open_passing.js b/netwerk/test/unit/test_redirect_from_script_after-open_passing.js index 9bf70efd0b08..315f888f642c 100644 --- a/netwerk/test/unit/test_redirect_from_script_after-open_passing.js +++ b/netwerk/test/unit/test_redirect_from_script_after-open_passing.js @@ -35,24 +35,24 @@ let redirectHook = "http-on-examine-response"; var httpServer = null, httpServer2 = null; -XPCOMUtils.defineLazyGetter(this, "port1", function () { +ChromeUtils.defineLazyGetter(this, "port1", function () { return httpServer.identity.primaryPort; }); -XPCOMUtils.defineLazyGetter(this, "port2", function () { +ChromeUtils.defineLazyGetter(this, "port2", function () { return httpServer2.identity.primaryPort; }); // Test Part 1: a cross-path redirect on a single HTTP server // http://localhost:port1/bait -> http://localhost:port1/switch var baitPath = "/bait"; -XPCOMUtils.defineLazyGetter(this, "baitURI", function () { +ChromeUtils.defineLazyGetter(this, "baitURI", function () { return "http://localhost:" + port1 + baitPath; }); var baitText = "you got the worm"; var redirectedPath = "/switch"; -XPCOMUtils.defineLazyGetter(this, "redirectedURI", function () { +ChromeUtils.defineLazyGetter(this, "redirectedURI", function () { return "http://localhost:" + port1 + redirectedPath; }); var redirectedText = "worms are not tasty"; @@ -60,25 +60,25 @@ var redirectedText = "worms are not tasty"; // Test Part 2: Now, a redirect to a different server // http://localhost:port1/bait2 -> http://localhost:port2/switch var bait2Path = "/bait2"; -XPCOMUtils.defineLazyGetter(this, "bait2URI", function () { +ChromeUtils.defineLazyGetter(this, "bait2URI", function () { return "http://localhost:" + port1 + bait2Path; }); -XPCOMUtils.defineLazyGetter(this, "redirected2URI", function () { +ChromeUtils.defineLazyGetter(this, "redirected2URI", function () { return "http://localhost:" + port2 + redirectedPath; }); // Test Part 3, begin with a serverside redirect that itself turns into an instance // of Test Part 1 var bait3Path = "/bait3"; -XPCOMUtils.defineLazyGetter(this, "bait3URI", function () { +ChromeUtils.defineLazyGetter(this, "bait3URI", function () { return "http://localhost:" + port1 + bait3Path; }); // Test Part 4, begin with this client-side redirect and which then redirects // to an instance of Test Part 1 var bait4Path = "/bait4"; -XPCOMUtils.defineLazyGetter(this, "bait4URI", function () { +ChromeUtils.defineLazyGetter(this, "bait4URI", function () { return "http://localhost:" + port1 + bait4Path; }); diff --git a/netwerk/test/unit/test_redirect_history.js b/netwerk/test/unit/test_redirect_history.js index c29fcb98814d..124f97688127 100644 --- a/netwerk/test/unit/test_redirect_history.js +++ b/netwerk/test/unit/test_redirect_history.js @@ -9,7 +9,7 @@ const ReferrerInfo = Components.Constructor( "init" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_redirect_passing.js b/netwerk/test/unit/test_redirect_passing.js index e72b36a912aa..b712e4d8192b 100644 --- a/netwerk/test/unit/test_redirect_passing.js +++ b/netwerk/test/unit/test_redirect_passing.js @@ -4,7 +4,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); @@ -12,7 +12,7 @@ var httpServer = null; // Need to randomize, because apparently no one clears our cache var randomPath = "/redirect/" + Math.random(); -XPCOMUtils.defineLazyGetter(this, "randomURI", function () { +ChromeUtils.defineLazyGetter(this, "randomURI", function () { return URL + randomPath; }); diff --git a/netwerk/test/unit/test_redirect_veto.js b/netwerk/test/unit/test_redirect_veto.js index fc8ab11e7e5d..bcc9ddb6259d 100644 --- a/netwerk/test/unit/test_redirect_veto.js +++ b/netwerk/test/unit/test_redirect_veto.js @@ -4,7 +4,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); @@ -12,7 +12,7 @@ var httpServer = null; // Need to randomize, because apparently no one clears our cache var randomPath = "/redirect/" + Math.random(); -XPCOMUtils.defineLazyGetter(this, "randomURI", function () { +ChromeUtils.defineLazyGetter(this, "randomURI", function () { return URL + randomPath; }); diff --git a/netwerk/test/unit/test_reentrancy.js b/netwerk/test/unit/test_reentrancy.js index 5830b35151d9..3bd7f54f79d6 100644 --- a/netwerk/test/unit/test_reentrancy.js +++ b/netwerk/test/unit/test_reentrancy.js @@ -4,7 +4,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_resumable_channel.js b/netwerk/test/unit/test_resumable_channel.js index 6c6c58b8634f..0407aa498306 100644 --- a/netwerk/test/unit/test_resumable_channel.js +++ b/netwerk/test/unit/test_resumable_channel.js @@ -5,7 +5,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserver.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_separate_connections.js b/netwerk/test/unit/test_separate_connections.js index 4c5b0a296c51..4f5c82ec979b 100644 --- a/netwerk/test/unit/test_separate_connections.js +++ b/netwerk/test/unit/test_separate_connections.js @@ -4,7 +4,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserv.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_suspend_channel_on_authRetry.js b/netwerk/test/unit/test_suspend_channel_on_authRetry.js index edd1332b2986..ad0b728b68db 100644 --- a/netwerk/test/unit/test_suspend_channel_on_authRetry.js +++ b/netwerk/test/unit/test_suspend_channel_on_authRetry.js @@ -6,7 +6,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserv.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_synthesized_response.js b/netwerk/test/unit/test_synthesized_response.js index 788d99cee04a..e2bb402ad7da 100644 --- a/netwerk/test/unit/test_synthesized_response.js +++ b/netwerk/test/unit/test_synthesized_response.js @@ -4,7 +4,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_tls_flags_separate_connections.js b/netwerk/test/unit/test_tls_flags_separate_connections.js index 9136bc7393dd..a67c15d8a6f6 100644 --- a/netwerk/test/unit/test_tls_flags_separate_connections.js +++ b/netwerk/test/unit/test_tls_flags_separate_connections.js @@ -4,7 +4,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpserv.identity.primaryPort; }); diff --git a/netwerk/test/unit/test_trr_proxy.js b/netwerk/test/unit/test_trr_proxy.js index 63fb966cecf9..962971d1032f 100644 --- a/netwerk/test/unit/test_trr_proxy.js +++ b/netwerk/test/unit/test_trr_proxy.js @@ -30,7 +30,7 @@ function FindProxyForURL(url, host) { return "DIRECT"; } -XPCOMUtils.defineLazyGetter(this, "systemSettings", function () { +ChromeUtils.defineLazyGetter(this, "systemSettings", function () { return { QueryInterface: ChromeUtils.generateQI(["nsISystemProxySettings"]), diff --git a/netwerk/test/unit_ipc/child_veto_in_parent.js b/netwerk/test/unit_ipc/child_veto_in_parent.js index 35a4ae79c729..8f922a254ea3 100644 --- a/netwerk/test/unit_ipc/child_veto_in_parent.js +++ b/netwerk/test/unit_ipc/child_veto_in_parent.js @@ -6,7 +6,7 @@ const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return "http://localhost:" + httpServer.identity.primaryPort; }); @@ -14,7 +14,7 @@ var httpServer = null; // Need to randomize, because apparently no one clears our cache var randomPath = "/redirect/" + Math.random(); -XPCOMUtils.defineLazyGetter(this, "randomURI", function () { +ChromeUtils.defineLazyGetter(this, "randomURI", function () { return URL + randomPath; }); diff --git a/netwerk/test/unit_ipc/test_cookie_header_stripped.js b/netwerk/test/unit_ipc/test_cookie_header_stripped.js index a220d0c5d030..273fa5fbde0a 100644 --- a/netwerk/test/unit_ipc/test_cookie_header_stripped.js +++ b/netwerk/test/unit_ipc/test_cookie_header_stripped.js @@ -5,7 +5,7 @@ const { HttpServer } = ChromeUtils.importESModule( ); const TEST_DOMAIN = "www.example.com"; -XPCOMUtils.defineLazyGetter(this, "URL", function () { +ChromeUtils.defineLazyGetter(this, "URL", function () { return ( "http://" + TEST_DOMAIN + ":" + httpserv.identity.primaryPort + "/path" ); diff --git a/security/manager/pki/resources/content/changepassword.js b/security/manager/pki/resources/content/changepassword.js index e3d6b118bf95..b498bf9ce04f 100644 --- a/security/manager/pki/resources/content/changepassword.js +++ b/security/manager/pki/resources/content/changepassword.js @@ -7,7 +7,7 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -XPCOMUtils.defineLazyGetter( +ChromeUtils.defineLazyGetter( this, "l10n", () => new Localization(["security/pippki/pippki.ftl"], true) diff --git a/security/sandbox/test/browser_content_sandbox_syscalls.js b/security/sandbox/test/browser_content_sandbox_syscalls.js index 28e1b1d9d2e2..dab47cf356c8 100644 --- a/security/sandbox/test/browser_content_sandbox_syscalls.js +++ b/security/sandbox/test/browser_content_sandbox_syscalls.js @@ -12,7 +12,9 @@ Services.scriptloader.loadSubScript( const lazy = {}; /* getLibcConstants is only present on *nix */ -XPCOMUtils.defineLazyGetter(lazy, "LIBC", () => ChromeUtils.getLibcConstants()); +ChromeUtils.defineLazyGetter(lazy, "LIBC", () => + ChromeUtils.getLibcConstants() +); /* * This test is for executing system calls in content processes to validate diff --git a/services/common/kinto-offline-client.js b/services/common/kinto-offline-client.js index d91cd341fe82..7b11347555db 100644 --- a/services/common/kinto-offline-client.js +++ b/services/common/kinto-offline-client.js @@ -2600,7 +2600,7 @@ var EXPORTED_SYMBOLS = ["Kinto"]; // Use standalone kinto-http module landed in FFx. KintoHttpClient: "resource://services-common/kinto-http-client.sys.mjs" }); - XPCOMUtils.defineLazyGetter(global, "generateUUID", () => { + ChromeUtils.defineLazyGetter(global, "generateUUID", () => { const { generateUUID } = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator); return generateUUID; }); diff --git a/services/sync/tests/unit/head_helpers.js b/services/sync/tests/unit/head_helpers.js index 2557a1495bac..e79e55e57f0d 100644 --- a/services/sync/tests/unit/head_helpers.js +++ b/services/sync/tests/unit/head_helpers.js @@ -70,7 +70,7 @@ add_setup(async function head_setup() { } }); -XPCOMUtils.defineLazyGetter(this, "SyncPingSchema", function () { +ChromeUtils.defineLazyGetter(this, "SyncPingSchema", function () { let { FileUtils } = ChromeUtils.importESModule( "resource://gre/modules/FileUtils.sys.mjs" ); @@ -97,7 +97,7 @@ XPCOMUtils.defineLazyGetter(this, "SyncPingSchema", function () { return schema; }); -XPCOMUtils.defineLazyGetter(this, "SyncPingValidator", function () { +ChromeUtils.defineLazyGetter(this, "SyncPingValidator", function () { const { JsonSchema } = ChromeUtils.importESModule( "resource://gre/modules/JsonSchema.sys.mjs" ); diff --git a/toolkit/components/aboutmemory/content/aboutMemory.js b/toolkit/components/aboutmemory/content/aboutMemory.js index 93937c641382..da2fd560d23c 100644 --- a/toolkit/components/aboutmemory/content/aboutMemory.js +++ b/toolkit/components/aboutmemory/content/aboutMemory.js @@ -40,17 +40,17 @@ ChromeUtils.defineESModuleGetters(this, { FileUtils: "resource://gre/modules/FileUtils.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "nsBinaryStream", () => +ChromeUtils.defineLazyGetter(this, "nsBinaryStream", () => CC( "@mozilla.org/binaryinputstream;1", "nsIBinaryInputStream", "setInputStream" ) ); -XPCOMUtils.defineLazyGetter(this, "nsFile", () => +ChromeUtils.defineLazyGetter(this, "nsFile", () => CC("@mozilla.org/file/local;1", "nsIFile", "initWithPath") ); -XPCOMUtils.defineLazyGetter(this, "nsGzipConverter", () => +ChromeUtils.defineLazyGetter(this, "nsGzipConverter", () => CC( "@mozilla.org/streamconv;1?from=gzip&to=uncompressed", "nsIStreamConverter" diff --git a/toolkit/components/aboutprocesses/content/aboutProcesses.js b/toolkit/components/aboutprocesses/content/aboutProcesses.js index 1d94c52c1f9a..b28f7486012a 100644 --- a/toolkit/components/aboutprocesses/content/aboutProcesses.js +++ b/toolkit/components/aboutprocesses/content/aboutProcesses.js @@ -39,7 +39,7 @@ ChromeUtils.defineESModuleGetters(this, { "resource://gre/modules/ContextualIdentityService.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "ProfilerPopupBackground", function () { +ChromeUtils.defineLazyGetter(this, "ProfilerPopupBackground", function () { return ChromeUtils.import( "resource://devtools/client/performance-new/shared/background.jsm.js" ); diff --git a/toolkit/components/antitracking/test/xpcshell/test_tracking_db_service.js b/toolkit/components/antitracking/test/xpcshell/test_tracking_db_service.js index 0f6ded1218e8..01d2066dfa0a 100644 --- a/toolkit/components/antitracking/test/xpcshell/test_tracking_db_service.js +++ b/toolkit/components/antitracking/test/xpcshell/test_tracking_db_service.js @@ -16,7 +16,7 @@ XPCOMUtils.defineLazyServiceGetter( "nsITrackingDBService" ); -XPCOMUtils.defineLazyGetter(this, "DB_PATH", function () { +ChromeUtils.defineLazyGetter(this, "DB_PATH", function () { return PathUtils.join(PathUtils.profileDir, "protections.sqlite"); }); diff --git a/toolkit/components/downloads/test/unit/test_DownloadIntegration.js b/toolkit/components/downloads/test/unit/test_DownloadIntegration.js index 486ff8a346a7..7ee34e83079e 100644 --- a/toolkit/components/downloads/test/unit/test_DownloadIntegration.js +++ b/toolkit/components/downloads/test/unit/test_DownloadIntegration.js @@ -58,7 +58,7 @@ function allowDirectoriesInTest() { return cleanup; } -XPCOMUtils.defineLazyGetter(this, "gStringBundle", function () { +ChromeUtils.defineLazyGetter(this, "gStringBundle", function () { return Services.strings.createBundle( "chrome://mozapps/locale/downloads/downloads.properties" ); diff --git a/toolkit/components/extensions/child/ext-test.js b/toolkit/components/extensions/child/ext-test.js index 98dca726bb0a..a4178b63ff30 100644 --- a/toolkit/components/extensions/child/ext-test.js +++ b/toolkit/components/extensions/child/ext-test.js @@ -4,7 +4,7 @@ "use strict"; -XPCOMUtils.defineLazyGetter(this, "isXpcshell", function () { +ChromeUtils.defineLazyGetter(this, "isXpcshell", function () { return Services.env.exists("XPCSHELL_TEST_PROFILE_DIR"); }); diff --git a/toolkit/components/extensions/parent/ext-backgroundPage.js b/toolkit/components/extensions/parent/ext-backgroundPage.js index 10757c9bdf92..651bae313003 100644 --- a/toolkit/components/extensions/parent/ext-backgroundPage.js +++ b/toolkit/components/extensions/parent/ext-backgroundPage.js @@ -18,7 +18,7 @@ ChromeUtils.defineESModuleGetters(this, { PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "serviceWorkerManager", () => { +ChromeUtils.defineLazyGetter(this, "serviceWorkerManager", () => { return Cc["@mozilla.org/serviceworkers/manager;1"].getService( Ci.nsIServiceWorkerManager ); diff --git a/toolkit/components/extensions/parent/ext-geckoProfiler.js b/toolkit/components/extensions/parent/ext-geckoProfiler.js index f165cc1a7300..0d4bc945968d 100644 --- a/toolkit/components/extensions/parent/ext-geckoProfiler.js +++ b/toolkit/components/extensions/parent/ext-geckoProfiler.js @@ -15,7 +15,7 @@ const ASYNC_STACKS_ENABLED = Services.prefs.getBoolPref( var { ExtensionError } = ExtensionUtils; -XPCOMUtils.defineLazyGetter(this, "symbolicationService", () => { +ChromeUtils.defineLazyGetter(this, "symbolicationService", () => { let { createLocalSymbolicationService } = ChromeUtils.import( "resource://devtools/client/performance-new/shared/symbolication.jsm.js" ); diff --git a/toolkit/components/extensions/parent/ext-management.js b/toolkit/components/extensions/parent/ext-management.js index a930a8d38e72..e0834d378fda 100644 --- a/toolkit/components/extensions/parent/ext-management.js +++ b/toolkit/components/extensions/parent/ext-management.js @@ -6,7 +6,7 @@ "use strict"; -XPCOMUtils.defineLazyGetter(this, "strBundle", function () { +ChromeUtils.defineLazyGetter(this, "strBundle", function () { return Services.strings.createBundle( "chrome://global/locale/extensions.properties" ); diff --git a/toolkit/components/extensions/parent/ext-storage.js b/toolkit/components/extensions/parent/ext-storage.js index 2f043ce688d7..350ca0acfa23 100644 --- a/toolkit/components/extensions/parent/ext-storage.js +++ b/toolkit/components/extensions/parent/ext-storage.js @@ -15,7 +15,7 @@ ChromeUtils.defineESModuleGetters(this, { var { ExtensionError } = ExtensionUtils; var { ignoreEvent } = ExtensionCommon; -XPCOMUtils.defineLazyGetter(this, "extensionStorageSync", () => { +ChromeUtils.defineLazyGetter(this, "extensionStorageSync", () => { // TODO bug 1637465: Remove Kinto-based implementation. if (Services.prefs.getBoolPref("webextensions.storage.sync.kinto")) { const { extensionStorageSyncKinto } = ChromeUtils.importESModule( diff --git a/toolkit/components/extensions/test/xpcshell/test_proxy_failover.js b/toolkit/components/extensions/test/xpcshell/test_proxy_failover.js index 4f787762482b..bca71df63e5c 100644 --- a/toolkit/components/extensions/test/xpcshell/test_proxy_failover.js +++ b/toolkit/components/extensions/test/xpcshell/test_proxy_failover.js @@ -13,7 +13,7 @@ AddonTestUtils.createAppInfo( Services.prefs.setBoolPref("network.proxy.allow_hijacking_localhost", true); // Pref is not builtin if direct failover is disabled in compile config. -XPCOMUtils.defineLazyGetter(this, "directFailoverDisabled", () => { +ChromeUtils.defineLazyGetter(this, "directFailoverDisabled", () => { return ( Services.prefs.getPrefType("network.proxy.failover_direct") == Ci.nsIPrefBranch.PREF_INVALID diff --git a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/head.js b/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/head.js index a23b2f67dcaf..7d77a80ee059 100644 --- a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/head.js +++ b/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/head.js @@ -15,7 +15,7 @@ ChromeUtils.defineESModuleGetters(this, { "resource://messaging-system/lib/SpecialMessageActions.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "fetchSMASchema", async () => { +ChromeUtils.defineLazyGetter(this, "fetchSMASchema", async () => { const response = await fetch( "resource://testing-common/SpecialMessageActionSchemas.json" ); diff --git a/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_docs.js b/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_docs.js index bb0288a0b528..e4618c8e5e26 100644 --- a/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_docs.js +++ b/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_docs.js @@ -11,7 +11,7 @@ const { JsonSchema } = ChromeUtils.importESModule( "resource://gre/modules/JsonSchema.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "fetchTriggerActionSchema", async () => { +ChromeUtils.defineLazyGetter(this, "fetchTriggerActionSchema", async () => { const response = await fetch( "resource://testing-common/TriggerActionSchemas.json" ); diff --git a/toolkit/components/nimbus/test/unit/test_ExperimentAPI_NimbusFeatures.js b/toolkit/components/nimbus/test/unit/test_ExperimentAPI_NimbusFeatures.js index 9333a128f5f1..9d263aecbf5a 100644 --- a/toolkit/components/nimbus/test/unit/test_ExperimentAPI_NimbusFeatures.js +++ b/toolkit/components/nimbus/test/unit/test_ExperimentAPI_NimbusFeatures.js @@ -9,7 +9,7 @@ const { JsonSchema } = ChromeUtils.importESModule( Cu.importGlobalProperties(["fetch"]); -XPCOMUtils.defineLazyGetter(this, "fetchSchema", () => { +ChromeUtils.defineLazyGetter(this, "fetchSchema", () => { return fetch("resource://nimbus/schemas/NimbusEnrollment.schema.json", { credentials: "omit", }).then(rsp => rsp.json()); diff --git a/toolkit/components/passwordmgr/test/unit/test_context_menu.js b/toolkit/components/passwordmgr/test/unit/test_context_menu.js index 56d4620338bf..c0947ea22be0 100644 --- a/toolkit/components/passwordmgr/test/unit/test_context_menu.js +++ b/toolkit/components/passwordmgr/test/unit/test_context_menu.js @@ -53,7 +53,7 @@ const HTTP_LOGIN_HTTPS_EXAMPLE_ORG_U1_P1 = authLogin({ origin: ORIGIN_HTTPS_EXAMPLE_ORG, }); -XPCOMUtils.defineLazyGetter(this, "_stringBundle", function () { +ChromeUtils.defineLazyGetter(this, "_stringBundle", function () { return Services.strings.createBundle( "chrome://passwordmgr/locale/passwordmgr.properties" ); diff --git a/toolkit/components/places/tests/head_common.js b/toolkit/components/places/tests/head_common.js index d1f271368408..48b34e17fe45 100644 --- a/toolkit/components/places/tests/head_common.js +++ b/toolkit/components/places/tests/head_common.js @@ -47,7 +47,7 @@ ChromeUtils.defineESModuleGetters(this, { TestUtils: "resource://testing-common/TestUtils.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "SMALLPNG_DATA_URI", function () { +ChromeUtils.defineLazyGetter(this, "SMALLPNG_DATA_URI", function () { return NetUtil.newURI( "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAA" + "AAAA6fptVAAAACklEQVQI12NgAAAAAgAB4iG8MwAAAABJRU5ErkJggg==" @@ -55,7 +55,7 @@ XPCOMUtils.defineLazyGetter(this, "SMALLPNG_DATA_URI", function () { }); const SMALLPNG_DATA_LEN = 67; -XPCOMUtils.defineLazyGetter(this, "SMALLSVG_DATA_URI", function () { +ChromeUtils.defineLazyGetter(this, "SMALLSVG_DATA_URI", function () { return NetUtil.newURI( "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy5" + "3My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIiBmaWxs" + @@ -67,7 +67,7 @@ XPCOMUtils.defineLazyGetter(this, "SMALLSVG_DATA_URI", function () { ); }); -XPCOMUtils.defineLazyGetter(this, "PlacesFrecencyRecalculator", () => { +ChromeUtils.defineLazyGetter(this, "PlacesFrecencyRecalculator", () => { return Cc["@mozilla.org/places/frecency-recalculator;1"].getService( Ci.nsIObserver ).wrappedJSObject; diff --git a/toolkit/components/shopping/content/ShoppingProduct.mjs b/toolkit/components/shopping/content/ShoppingProduct.mjs index 28d8a0665974..ae4ffdaaf13d 100644 --- a/toolkit/components/shopping/content/ShoppingProduct.mjs +++ b/toolkit/components/shopping/content/ShoppingProduct.mjs @@ -34,7 +34,7 @@ XPCOMUtils.defineLazyServiceGetters(lazy, { ], }); -XPCOMUtils.defineLazyGetter(lazy, "decoder", () => new TextDecoder()); +ChromeUtils.defineLazyGetter(lazy, "decoder", () => new TextDecoder()); const StringInputStream = Components.Constructor( "@mozilla.org/io/string-input-stream;1", diff --git a/toolkit/components/telemetry/tests/unit/test_PingAPI.js b/toolkit/components/telemetry/tests/unit/test_PingAPI.js index b03f87084656..a6ef791f6ac6 100644 --- a/toolkit/components/telemetry/tests/unit/test_PingAPI.js +++ b/toolkit/components/telemetry/tests/unit/test_PingAPI.js @@ -13,7 +13,7 @@ const { TelemetryArchive } = ChromeUtils.importESModule( "resource://gre/modules/TelemetryArchive.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "gPingsArchivePath", function () { +ChromeUtils.defineLazyGetter(this, "gPingsArchivePath", function () { return PathUtils.join(PathUtils.profileDir, "datareporting", "archived"); }); diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryController.js b/toolkit/components/telemetry/tests/unit/test_TelemetryController.js index bc71fab7a275..901033ae6adc 100644 --- a/toolkit/components/telemetry/tests/unit/test_TelemetryController.js +++ b/toolkit/components/telemetry/tests/unit/test_TelemetryController.js @@ -48,7 +48,7 @@ const TEST_PING_TYPE = "test-ping-type"; var gClientID = null; -XPCOMUtils.defineLazyGetter(this, "DATAREPORTING_PATH", async function () { +ChromeUtils.defineLazyGetter(this, "DATAREPORTING_PATH", async function () { return PathUtils.join(PathUtils.profileDir, "datareporting"); }); diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js b/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js index 19717e1dda58..d5f8f8e9c4fe 100644 --- a/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js +++ b/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js @@ -50,7 +50,7 @@ const DATAREPORTING_DIR = "datareporting"; const ABORTED_PING_FILE_NAME = "aborted-session-ping"; const ABORTED_SESSION_UPDATE_INTERVAL_MS = 5 * 60 * 1000; -XPCOMUtils.defineLazyGetter(this, "DATAREPORTING_PATH", function () { +ChromeUtils.defineLazyGetter(this, "DATAREPORTING_PATH", function () { return PathUtils.join(PathUtils.profileDir, DATAREPORTING_DIR); }); diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetrySession_abortedSessionQueued.js b/toolkit/components/telemetry/tests/unit/test_TelemetrySession_abortedSessionQueued.js index a248dd7b5570..80807469fc95 100644 --- a/toolkit/components/telemetry/tests/unit/test_TelemetrySession_abortedSessionQueued.js +++ b/toolkit/components/telemetry/tests/unit/test_TelemetrySession_abortedSessionQueued.js @@ -21,7 +21,7 @@ const PING_TYPE_MAIN = "main"; const REASON_ABORTED_SESSION = "aborted-session"; const TEST_PING_TYPE = "test-ping-type"; -XPCOMUtils.defineLazyGetter(this, "DATAREPORTING_PATH", function () { +ChromeUtils.defineLazyGetter(this, "DATAREPORTING_PATH", function () { return PathUtils.join(PathUtils.profileDir, DATAREPORTING_DIR); }); diff --git a/toolkit/components/timermanager/tests/unit/consumerNotifications.js b/toolkit/components/timermanager/tests/unit/consumerNotifications.js index 6ed280399a19..1e092070430f 100644 --- a/toolkit/components/timermanager/tests/unit/consumerNotifications.js +++ b/toolkit/components/timermanager/tests/unit/consumerNotifications.js @@ -137,7 +137,7 @@ const TESTS = [ var gUTM; var gNextFunc; -XPCOMUtils.defineLazyGetter(this, "gCompReg", function () { +ChromeUtils.defineLazyGetter(this, "gCompReg", function () { return Cm.QueryInterface(Ci.nsIComponentRegistrar); }); diff --git a/toolkit/content/aboutLogging.js b/toolkit/content/aboutLogging.js index dca8c5dea344..54f1f8c1bdef 100644 --- a/toolkit/content/aboutLogging.js +++ b/toolkit/content/aboutLogging.js @@ -20,7 +20,7 @@ const { CustomizableUI } = ChromeUtils.importESModule( "resource:///modules/CustomizableUI.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "ProfilerPopupBackground", function () { +ChromeUtils.defineLazyGetter(this, "ProfilerPopupBackground", function () { return ChromeUtils.import( "resource://devtools/client/performance-new/shared/background.jsm.js" ); diff --git a/toolkit/content/widgets/browser-custom-element.js b/toolkit/content/widgets/browser-custom-element.js index 7b6d3aaeb193..e66cd32b3184 100644 --- a/toolkit/content/widgets/browser-custom-element.js +++ b/toolkit/content/widgets/browser-custom-element.js @@ -26,7 +26,7 @@ RemoteWebNavigation: "resource://gre/modules/RemoteWebNavigation.sys.mjs", }); - XPCOMUtils.defineLazyGetter(lazy, "blankURI", () => + ChromeUtils.defineLazyGetter(lazy, "blankURI", () => Services.io.newURI("about:blank") ); @@ -118,7 +118,7 @@ this.mIconURL = null; this.lastURI = null; - XPCOMUtils.defineLazyGetter(this, "popupBlocker", () => { + ChromeUtils.defineLazyGetter(this, "popupBlocker", () => { return new lazy.PopupBlocker(this); }); diff --git a/toolkit/mozapps/extensions/content/aboutaddons.js b/toolkit/mozapps/extensions/content/aboutaddons.js index fb644b77c3b8..967139a2fc6e 100644 --- a/toolkit/mozapps/extensions/content/aboutaddons.js +++ b/toolkit/mozapps/extensions/content/aboutaddons.js @@ -23,7 +23,7 @@ ChromeUtils.defineESModuleGetters(this, { PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", }); -XPCOMUtils.defineLazyGetter(this, "extensionStylesheets", () => { +ChromeUtils.defineLazyGetter(this, "extensionStylesheets", () => { const { ExtensionParent } = ChromeUtils.importESModule( "resource://gre/modules/ExtensionParent.sys.mjs" ); diff --git a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js index 3e68a3ec3ec4..d1d4b85f3277 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js +++ b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js @@ -103,7 +103,7 @@ ExtensionTestUtils.init(this); AddonTestUtils.init(this); AddonTestUtils.overrideCertDB(); -XPCOMUtils.defineLazyGetter( +ChromeUtils.defineLazyGetter( this, "BOOTSTRAP_REASONS", () => AddonManagerPrivate.BOOTSTRAP_REASONS diff --git a/toolkit/mozapps/extensions/test/xpcshell/head_system_addons.js b/toolkit/mozapps/extensions/test/xpcshell/head_system_addons.js index 8131a93cbe7b..0d6fc59d757a 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/head_system_addons.js +++ b/toolkit/mozapps/extensions/test/xpcshell/head_system_addons.js @@ -13,7 +13,7 @@ function root(server) { return `${primaryScheme}://${primaryHost}:${primaryPort}/data`; } -XPCOMUtils.defineLazyGetter(this, "testserver", () => { +ChromeUtils.defineLazyGetter(this, "testserver", () => { let server = new HttpServer(); server.start(); Services.prefs.setCharPref( diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js b/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js index 51b5735ae8a7..3419be6bddeb 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js +++ b/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js @@ -15,7 +15,7 @@ const { UpdateUtils } = ChromeUtils.importESModule( "resource://gre/modules/UpdateUtils.sys.mjs" ); -XPCOMUtils.defineLazyGetter( +ChromeUtils.defineLazyGetter( this, "pluginsBundle", () => new Localization(["toolkit/about/aboutPlugins.ftl"]) diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_update_theme.js b/toolkit/mozapps/extensions/test/xpcshell/test_update_theme.js index 3192d47393b7..7d26f23981ad 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/test_update_theme.js +++ b/toolkit/mozapps/extensions/test/xpcshell/test_update_theme.js @@ -1,6 +1,6 @@ "use strict"; -XPCOMUtils.defineLazyGetter(this, "Management", () => { +ChromeUtils.defineLazyGetter(this, "Management", () => { const { ExtensionParent } = ChromeUtils.importESModule( "resource://gre/modules/ExtensionParent.sys.mjs" ); diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_langpack.js b/toolkit/mozapps/extensions/test/xpcshell/test_webextension_langpack.js index 40b09d311108..cb70a3910f96 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_langpack.js +++ b/toolkit/mozapps/extensions/test/xpcshell/test_webextension_langpack.js @@ -7,7 +7,7 @@ const { ExtensionUtils } = ChromeUtils.importESModule( "resource://gre/modules/ExtensionUtils.sys.mjs" ); -XPCOMUtils.defineLazyGetter(this, "resourceProtocol", () => +ChromeUtils.defineLazyGetter(this, "resourceProtocol", () => Services.io .getProtocolHandler("resource") .QueryInterface(Ci.nsIResProtocolHandler) diff --git a/toolkit/mozapps/update/tests/data/shared.js b/toolkit/mozapps/update/tests/data/shared.js index bca14c8b89be..66be92733123 100644 --- a/toolkit/mozapps/update/tests/data/shared.js +++ b/toolkit/mozapps/update/tests/data/shared.js @@ -114,7 +114,7 @@ const URI_UPDATES_PROPERTIES = "chrome://mozapps/locale/update/updates.properties"; const gUpdateBundle = Services.strings.createBundle(URI_UPDATES_PROPERTIES); -XPCOMUtils.defineLazyGetter(this, "gAUS", function test_gAUS() { +ChromeUtils.defineLazyGetter(this, "gAUS", function test_gAUS() { return Cc["@mozilla.org/updates/update-service;1"] .getService(Ci.nsIApplicationUpdateService) .QueryInterface(Ci.nsITimerCallback) @@ -135,11 +135,11 @@ XPCOMUtils.defineLazyServiceGetter( "nsIUpdateChecker" ); -XPCOMUtils.defineLazyGetter(this, "gDefaultPrefBranch", function test_gDPB() { +ChromeUtils.defineLazyGetter(this, "gDefaultPrefBranch", function test_gDPB() { return Services.prefs.getDefaultBranch(null); }); -XPCOMUtils.defineLazyGetter(this, "gPrefRoot", function test_gPR() { +ChromeUtils.defineLazyGetter(this, "gPrefRoot", function test_gPR() { return Services.prefs.getBranch(null); }); diff --git a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js index f3b4736a8485..32e115d5af0f 100644 --- a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js +++ b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js @@ -1635,61 +1635,65 @@ function getSpecialFolderDir(aCSIDL) { return dir; } -XPCOMUtils.defineLazyGetter(this, "gInstallDirPathHash", function test_gIDPH() { - if (AppConstants.platform != "win") { - do_throw("Windows only function called by a different platform!"); - } +ChromeUtils.defineLazyGetter( + this, + "gInstallDirPathHash", + function test_gIDPH() { + if (AppConstants.platform != "win") { + do_throw("Windows only function called by a different platform!"); + } - if (!MOZ_APP_BASENAME) { - return null; - } + if (!MOZ_APP_BASENAME) { + return null; + } - let vendor = MOZ_APP_VENDOR ? MOZ_APP_VENDOR : "Mozilla"; - let appDir = getApplyDirFile(); + let vendor = MOZ_APP_VENDOR ? MOZ_APP_VENDOR : "Mozilla"; + let appDir = getApplyDirFile(); - const REG_PATH = - "SOFTWARE\\" + vendor + "\\" + MOZ_APP_BASENAME + "\\TaskBarIDs"; - let regKey = Cc["@mozilla.org/windows-registry-key;1"].createInstance( - Ci.nsIWindowsRegKey - ); - try { - regKey.open( - Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE, - REG_PATH, - Ci.nsIWindowsRegKey.ACCESS_ALL + const REG_PATH = + "SOFTWARE\\" + vendor + "\\" + MOZ_APP_BASENAME + "\\TaskBarIDs"; + let regKey = Cc["@mozilla.org/windows-registry-key;1"].createInstance( + Ci.nsIWindowsRegKey ); - regKey.writeStringValue(appDir.path, gTestID); - return gTestID; - } catch (e) {} + try { + regKey.open( + Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE, + REG_PATH, + Ci.nsIWindowsRegKey.ACCESS_ALL + ); + regKey.writeStringValue(appDir.path, gTestID); + return gTestID; + } catch (e) {} - try { - regKey.create( - Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER, - REG_PATH, - Ci.nsIWindowsRegKey.ACCESS_ALL - ); - regKey.writeStringValue(appDir.path, gTestID); - return gTestID; - } catch (e) { - logTestInfo( - "failed to create registry value. Registry Path: " + - REG_PATH + - ", Value Name: " + - appDir.path + - ", Value Data: " + - gTestID + - ", Exception " + - e - ); - do_throw( - "Unable to write HKLM or HKCU TaskBarIDs registry value, key path: " + - REG_PATH - ); + try { + regKey.create( + Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER, + REG_PATH, + Ci.nsIWindowsRegKey.ACCESS_ALL + ); + regKey.writeStringValue(appDir.path, gTestID); + return gTestID; + } catch (e) { + logTestInfo( + "failed to create registry value. Registry Path: " + + REG_PATH + + ", Value Name: " + + appDir.path + + ", Value Data: " + + gTestID + + ", Exception " + + e + ); + do_throw( + "Unable to write HKLM or HKCU TaskBarIDs registry value, key path: " + + REG_PATH + ); + } + return null; } - return null; -}); +); -XPCOMUtils.defineLazyGetter(this, "gLocalAppDataDir", function test_gLADD() { +ChromeUtils.defineLazyGetter(this, "gLocalAppDataDir", function test_gLADD() { if (AppConstants.platform != "win") { do_throw("Windows only function called by a different platform!"); } @@ -1698,7 +1702,7 @@ XPCOMUtils.defineLazyGetter(this, "gLocalAppDataDir", function test_gLADD() { return getSpecialFolderDir(CSIDL_LOCAL_APPDATA); }); -XPCOMUtils.defineLazyGetter(this, "gCommonAppDataDir", function test_gCDD() { +ChromeUtils.defineLazyGetter(this, "gCommonAppDataDir", function test_gCDD() { if (AppConstants.platform != "win") { do_throw("Windows only function called by a different platform!"); } @@ -1707,7 +1711,7 @@ XPCOMUtils.defineLazyGetter(this, "gCommonAppDataDir", function test_gCDD() { return getSpecialFolderDir(CSIDL_COMMON_APPDATA); }); -XPCOMUtils.defineLazyGetter(this, "gProgFilesDir", function test_gPFD() { +ChromeUtils.defineLazyGetter(this, "gProgFilesDir", function test_gPFD() { if (AppConstants.platform != "win") { do_throw("Windows only function called by a different platform!"); } @@ -1777,7 +1781,7 @@ function createWorldWritableAppUpdateDir() { } } -XPCOMUtils.defineLazyGetter(this, "gUpdatesRootDir", function test_gURD() { +ChromeUtils.defineLazyGetter(this, "gUpdatesRootDir", function test_gURD() { if (AppConstants.platform != "macosx") { do_throw("Mac OS X only function called by a different platform!"); } -- 2.11.4.GIT