commit dd51c08fb80c86957a92b6b13f40ca4f34a16294 parent 2e8b1edf0d7a08c18161d3bdf68c992aa339db06 Author: Rebecca King <rking@mozilla.com> Date: Tue, 6 Jan 2026 18:45:08 +0000 Bug 2007929 - Update IP Protection imports to use moz src - r=ip-protection-reviewers,omc-reviewers,emcminn,fchasen Differential Revision: https://phabricator.services.mozilla.com/D277608 Diffstat:
48 files changed, 189 insertions(+), 157 deletions(-)
diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest @@ -21,7 +21,7 @@ category browser-before-ui-startup moz-src:///browser/components/privatebrowsing category browser-before-ui-startup resource:///modules/AboutHomeStartupCache.sys.mjs AboutHomeStartupCache.init category browser-before-ui-startup resource:///modules/AccountsGlue.sys.mjs AccountsGlue.init category browser-before-ui-startup moz-src:///browser/modules/ObserverForwarder.sys.mjs ObserverForwarder.init -category browser-before-ui-startup resource:///modules/ipprotection/IPProtectionService.sys.mjs IPProtectionService.maybeEarlyInit +category browser-before-ui-startup moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs IPProtectionService.maybeEarlyInit # Browser window lifecycle consumers category browser-window-domcontentloaded-before-tabbrowser resource:///modules/BrowserDOMWindow.sys.mjs BrowserDOMWindow.setupInWindow @@ -52,7 +52,7 @@ category browser-first-window-ready moz-src:///toolkit/profile/ProfilesDatastore category browser-first-window-ready resource:///modules/profiles/SelectableProfileService.sys.mjs SelectableProfileService.init category browser-first-window-ready moz-src:///browser/components/protections/ContentBlockingPrefs.sys.mjs ContentBlockingPrefs.init category browser-first-window-ready resource://gre/modules/CaptchaDetectionPingUtils.sys.mjs CaptchaDetectionPingUtils.init -category browser-first-window-ready resource:///modules/ipprotection/IPProtectionService.sys.mjs IPProtectionService.init +category browser-first-window-ready moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs IPProtectionService.init #ifdef MOZ_SANDBOX #ifdef XP_LINUX category browser-first-window-ready resource://gre/modules/SandboxUtils.sys.mjs SandboxUtils.maybeWarnAboutMissingUserNamespaces @@ -104,6 +104,6 @@ category browser-quit-application-granted moz-src:///browser/components/search/S category browser-quit-application-granted resource://gre/modules/UpdateListener.sys.mjs UpdateListener.reset #endif category browser-quit-application-granted moz-src:///browser/components/urlbar/UrlbarSearchTermsPersistence.sys.mjs UrlbarSearchTermsPersistence.uninit -category browser-quit-application-granted resource:///modules/ipprotection/IPProtectionService.sys.mjs IPProtectionService.uninit +category browser-quit-application-granted moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs IPProtectionService.uninit category search-service-notification moz-src:///browser/components/search/SearchUIUtils.sys.mjs SearchUIUtils.showSearchServiceNotification diff --git a/browser/components/asrouter/tests/browser/browser_trigger_listeners.js b/browser/components/asrouter/tests/browser/browser_trigger_listeners.js @@ -16,7 +16,8 @@ ChromeUtils.defineLazyGetter(this, "SearchTestUtils", () => { }); ChromeUtils.defineESModuleGetters(this, { - IPProtection: "resource:///modules/ipprotection/IPProtection.sys.mjs", + IPProtection: + "moz-src:///browser/components/ipprotection/IPProtection.sys.mjs", }); const mockIdleService = { diff --git a/browser/components/ipprotection/IPPAutoStart.sys.mjs b/browser/components/ipprotection/IPPAutoStart.sys.mjs @@ -8,13 +8,15 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { IPProtectionServerlist: - "resource:///modules/ipprotection/IPProtectionServerlist.sys.mjs", - IPPProxyManager: "resource:///modules/ipprotection/IPPProxyManager.sys.mjs", - IPPProxyStates: "resource:///modules/ipprotection/IPPProxyManager.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionServerlist.sys.mjs", + IPPProxyManager: + "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs", + IPPProxyStates: + "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs", IPProtectionService: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", IPProtectionStates: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", }); const AUTOSTART_FEATURE_ENABLE_PREF = "browser.ipProtection.features.autoStart"; diff --git a/browser/components/ipprotection/IPPChannelFilter.sys.mjs b/browser/components/ipprotection/IPPChannelFilter.sys.mjs @@ -6,7 +6,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = XPCOMUtils.declareLazy({ IPPExceptionsManager: - "resource:///modules/ipprotection/IPPExceptionsManager.sys.mjs", + "moz-src:///browser/components/ipprotection/IPPExceptionsManager.sys.mjs", ProxyService: { service: "@mozilla.org/network/protocol-proxy-service;1", iid: Ci.nsIProtocolProxyService, diff --git a/browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs b/browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs @@ -5,10 +5,12 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - IPPStartupCache: "resource:///modules/ipprotection/IPPStartupCache.sys.mjs", + IPPStartupCache: + "moz-src:///browser/components/ipprotection/IPPStartupCache.sys.mjs", IPProtectionService: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", - IPPSignInWatcher: "resource:///modules/ipprotection/IPPSignInWatcher.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", + IPPSignInWatcher: + "moz-src:///browser/components/ipprotection/IPPSignInWatcher.sys.mjs", }); const LOG_PREF = "browser.ipProtection.log"; diff --git a/browser/components/ipprotection/IPPNimbusHelper.sys.mjs b/browser/components/ipprotection/IPPNimbusHelper.sys.mjs @@ -11,7 +11,7 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { IPProtectionService: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs", }); /** diff --git a/browser/components/ipprotection/IPPOnboardingMessageHelper.sys.mjs b/browser/components/ipprotection/IPPOnboardingMessageHelper.sys.mjs @@ -7,8 +7,10 @@ import { ONBOARDING_PREF_FLAGS } from "chrome://browser/content/ipprotection/ipp const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - IPPProxyManager: "resource:///modules/ipprotection/IPPProxyManager.sys.mjs", - IPPProxyStates: "resource:///modules/ipprotection/IPPProxyManager.sys.mjs", + IPPProxyManager: + "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs", + IPPProxyStates: + "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs", }); const ONBOARDING_MESSAGE_MASK_PREF = diff --git a/browser/components/ipprotection/IPPOptOutHelper.sys.mjs b/browser/components/ipprotection/IPPOptOutHelper.sys.mjs @@ -8,7 +8,7 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { IPProtectionService: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", }); const OPTED_OUT_PREF = "browser.ipProtection.optedOut"; diff --git a/browser/components/ipprotection/IPPProxyManager.sys.mjs b/browser/components/ipprotection/IPPProxyManager.sys.mjs @@ -6,18 +6,19 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { IPPEnrollAndEntitleManager: - "resource:///modules/ipprotection/IPPEnrollAndEntitleManager.sys.mjs", - IPPChannelFilter: "resource:///modules/ipprotection/IPPChannelFilter.sys.mjs", + "moz-src:///browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs", + IPPChannelFilter: + "moz-src:///browser/components/ipprotection/IPPChannelFilter.sys.mjs", IPProtectionUsage: - "resource:///modules/ipprotection/IPProtectionUsage.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionUsage.sys.mjs", IPPNetworkErrorObserver: - "resource:///modules/ipprotection/IPPNetworkErrorObserver.sys.mjs", + "moz-src:///browser/components/ipprotection/IPPNetworkErrorObserver.sys.mjs", IPProtectionServerlist: - "resource:///modules/ipprotection/IPProtectionServerlist.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionServerlist.sys.mjs", IPProtectionService: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", IPProtectionStates: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", }); ChromeUtils.defineLazyGetter( diff --git a/browser/components/ipprotection/IPPSignInWatcher.sys.mjs b/browser/components/ipprotection/IPPSignInWatcher.sys.mjs @@ -6,7 +6,7 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { IPProtectionService: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", UIState: "resource://services-sync/UIState.sys.mjs", }); diff --git a/browser/components/ipprotection/IPPStartupCache.sys.mjs b/browser/components/ipprotection/IPPStartupCache.sys.mjs @@ -6,9 +6,9 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { IPProtectionService: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", IPProtectionStates: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", }); const STATE_CACHE_PREF = "browser.ipProtection.stateCache"; diff --git a/browser/components/ipprotection/IPPVPNAddonHelper.sys.mjs b/browser/components/ipprotection/IPPVPNAddonHelper.sys.mjs @@ -7,7 +7,7 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { AddonManager: "resource://gre/modules/AddonManager.sys.mjs", IPProtectionService: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", }); const VPN_ADDON_ID = "vpn@mozilla.com"; diff --git a/browser/components/ipprotection/IPProtection.sys.mjs b/browser/components/ipprotection/IPProtection.sys.mjs @@ -12,13 +12,15 @@ ChromeUtils.defineESModuleGetters(lazy, { CustomizableUI: "moz-src:///browser/components/customizableui/CustomizableUI.sys.mjs", IPProtectionPanel: - "resource:///modules/ipprotection/IPProtectionPanel.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionPanel.sys.mjs", IPProtectionService: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", IPProtectionStates: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", - IPPProxyManager: "resource:///modules/ipprotection/IPPProxyManager.sys.mjs", - IPPProxyStates: "resource:///modules/ipprotection/IPPProxyManager.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", + IPPProxyManager: + "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs", + IPPProxyStates: + "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs", requestIdleCallback: "resource://gre/modules/Timer.sys.mjs", cancelIdleCallback: "resource://gre/modules/Timer.sys.mjs", }); diff --git a/browser/components/ipprotection/IPProtectionHelpers.sys.mjs b/browser/components/ipprotection/IPProtectionHelpers.sys.mjs @@ -11,24 +11,25 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { IPPExceptionsManager: - "resource:///modules/ipprotection/IPPExceptionsManager.sys.mjs", - IPProtection: "resource:///modules/ipprotection/IPProtection.sys.mjs", + "moz-src:///browser/components/ipprotection/IPPExceptionsManager.sys.mjs", + IPProtection: + "moz-src:///browser/components/ipprotection/IPProtection.sys.mjs", IPProtectionService: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", IPProtectionStates: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", }); -import { IPPProxyManager } from "resource:///modules/ipprotection/IPPProxyManager.sys.mjs"; -import { IPPAutoStartHelpers } from "resource:///modules/ipprotection/IPPAutoStart.sys.mjs"; -import { IPPEnrollAndEntitleManager } from "resource:///modules/ipprotection/IPPEnrollAndEntitleManager.sys.mjs"; -import { IPPNimbusHelper } from "resource:///modules/ipprotection/IPPNimbusHelper.sys.mjs"; -import { IPPOnboardingMessage } from "resource:///modules/ipprotection/IPPOnboardingMessageHelper.sys.mjs"; -import { IPProtectionServerlist } from "resource:///modules/ipprotection/IPProtectionServerlist.sys.mjs"; -import { IPPSignInWatcher } from "resource:///modules/ipprotection/IPPSignInWatcher.sys.mjs"; -import { IPPStartupCache } from "resource:///modules/ipprotection/IPPStartupCache.sys.mjs"; -import { IPPOptOutHelper } from "resource:///modules/ipprotection/IPPOptOutHelper.sys.mjs"; -import { IPPVPNAddonHelper } from "resource:///modules/ipprotection/IPPVPNAddonHelper.sys.mjs"; +import { IPPProxyManager } from "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs"; +import { IPPAutoStartHelpers } from "moz-src:///browser/components/ipprotection/IPPAutoStart.sys.mjs"; +import { IPPEnrollAndEntitleManager } from "moz-src:///browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs"; +import { IPPNimbusHelper } from "moz-src:///browser/components/ipprotection/IPPNimbusHelper.sys.mjs"; +import { IPPOnboardingMessage } from "moz-src:///browser/components/ipprotection/IPPOnboardingMessageHelper.sys.mjs"; +import { IPProtectionServerlist } from "moz-src:///browser/components/ipprotection/IPProtectionServerlist.sys.mjs"; +import { IPPSignInWatcher } from "moz-src:///browser/components/ipprotection/IPPSignInWatcher.sys.mjs"; +import { IPPStartupCache } from "moz-src:///browser/components/ipprotection/IPPStartupCache.sys.mjs"; +import { IPPOptOutHelper } from "moz-src:///browser/components/ipprotection/IPPOptOutHelper.sys.mjs"; +import { IPPVPNAddonHelper } from "moz-src:///browser/components/ipprotection/IPPVPNAddonHelper.sys.mjs"; /** * This simple class controls the UI activation/deactivation. diff --git a/browser/components/ipprotection/IPProtectionPanel.sys.mjs b/browser/components/ipprotection/IPProtectionPanel.sys.mjs @@ -8,13 +8,17 @@ ChromeUtils.defineESModuleGetters(lazy, { CustomizableUI: "moz-src:///browser/components/customizableui/CustomizableUI.sys.mjs", IPPEnrollAndEntitleManager: - "resource:///modules/ipprotection/IPPEnrollAndEntitleManager.sys.mjs", - IPPProxyManager: "resource:///modules/ipprotection/IPPProxyManager.sys.mjs", - IPPProxyStates: "resource:///modules/ipprotection/IPPProxyManager.sys.mjs", + "moz-src:///browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs", + IPPProxyManager: + "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs", + IPPProxyStates: + "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs", IPProtectionService: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", - IPProtection: "resource:///modules/ipprotection/IPProtection.sys.mjs", - IPPSignInWatcher: "resource:///modules/ipprotection/IPPSignInWatcher.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", + IPProtection: + "moz-src:///browser/components/ipprotection/IPProtection.sys.mjs", + IPPSignInWatcher: + "moz-src:///browser/components/ipprotection/IPPSignInWatcher.sys.mjs", }); import { diff --git a/browser/components/ipprotection/IPProtectionServerlist.sys.mjs b/browser/components/ipprotection/IPProtectionServerlist.sys.mjs @@ -10,11 +10,12 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - IPPStartupCache: "resource:///modules/ipprotection/IPPStartupCache.sys.mjs", + IPPStartupCache: + "moz-src:///browser/components/ipprotection/IPPStartupCache.sys.mjs", IPProtectionService: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", IPProtectionStates: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", RemoteSettings: "resource://services-settings/remote-settings.sys.mjs", }); diff --git a/browser/components/ipprotection/IPProtectionService.sys.mjs b/browser/components/ipprotection/IPProtectionService.sys.mjs @@ -7,16 +7,22 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - GuardianClient: "resource:///modules/ipprotection/GuardianClient.sys.mjs", + GuardianClient: + "moz-src:///browser/components/ipprotection/GuardianClient.sys.mjs", IPPEnrollAndEntitleManager: - "resource:///modules/ipprotection/IPPEnrollAndEntitleManager.sys.mjs", - IPPHelpers: "resource:///modules/ipprotection/IPProtectionHelpers.sys.mjs", - IPPNimbusHelper: "resource:///modules/ipprotection/IPPNimbusHelper.sys.mjs", - IPPOptOutHelper: "resource:///modules/ipprotection/IPPOptOutHelper.sys.mjs", - IPPSignInWatcher: "resource:///modules/ipprotection/IPPSignInWatcher.sys.mjs", - IPPStartupCache: "resource:///modules/ipprotection/IPPStartupCache.sys.mjs", + "moz-src:///browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs", + IPPHelpers: + "moz-src:///browser/components/ipprotection/IPProtectionHelpers.sys.mjs", + IPPNimbusHelper: + "moz-src:///browser/components/ipprotection/IPPNimbusHelper.sys.mjs", + IPPOptOutHelper: + "moz-src:///browser/components/ipprotection/IPPOptOutHelper.sys.mjs", + IPPSignInWatcher: + "moz-src:///browser/components/ipprotection/IPPSignInWatcher.sys.mjs", + IPPStartupCache: + "moz-src:///browser/components/ipprotection/IPPStartupCache.sys.mjs", IPPVPNAddonHelper: - "resource:///modules/ipprotection/IPPVPNAddonHelper.sys.mjs", + "moz-src:///browser/components/ipprotection/IPPVPNAddonHelper.sys.mjs", SpecialMessageActions: "resource://messaging-system/lib/SpecialMessageActions.sys.mjs", }); diff --git a/browser/components/ipprotection/moz.build b/browser/components/ipprotection/moz.build @@ -9,7 +9,7 @@ with Files("**"): JAR_MANIFESTS += ["jar.mn"] -EXTRA_JS_MODULES.ipprotection += [ +MOZ_SRC_FILES += [ "GuardianClient.sys.mjs", "IPPAutoStart.sys.mjs", "IPPChannelFilter.sys.mjs", diff --git a/browser/components/ipprotection/tests/browser/browser_IPPChannelFilter.js b/browser/components/ipprotection/tests/browser/browser_IPPChannelFilter.js @@ -4,10 +4,10 @@ "use strict"; const { IPPChannelFilter } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPChannelFilter.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPChannelFilter.sys.mjs" ); const { IPPExceptionsManager } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPExceptionsManager.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPExceptionsManager.sys.mjs" ); add_task(async function test_createConnection_and_proxy() { diff --git a/browser/components/ipprotection/tests/browser/browser_IPPProxyManager.js b/browser/components/ipprotection/tests/browser/browser_IPPProxyManager.js @@ -5,7 +5,7 @@ "use strict"; const { IPProtectionServerlist } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPProtectionServerlist.sys.mjs" + "moz-src:///browser/components/ipprotection/IPProtectionServerlist.sys.mjs" ); // Don't add an experiment so we can test adding and removing it. @@ -125,7 +125,7 @@ add_task(async function test_IPPProxyManager_handleProxyErrorEvent() { */ add_task(async function test_IPPProxyManager_bug_1999946() { const { IPPChannelFilter } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPChannelFilter.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPChannelFilter.sys.mjs" ); // Hook the Call to create to capture the created channel filter diff --git a/browser/components/ipprotection/tests/browser/browser_guardian_client.js b/browser/components/ipprotection/tests/browser/browser_guardian_client.js @@ -5,7 +5,7 @@ "use strict"; const { GuardianClient } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/GuardianClient.sys.mjs" + "moz-src:///browser/components/ipprotection/GuardianClient.sys.mjs" ); function makeGuardianServer( diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_content.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_content.js @@ -10,9 +10,10 @@ const { LINKS } = ChromeUtils.importESModule( const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - IPProtectionWidget: "resource:///modules/ipprotection/IPProtection.sys.mjs", + IPProtectionWidget: + "moz-src:///browser/components/ipprotection/IPProtection.sys.mjs", IPProtectionPanel: - "resource:///modules/ipprotection/IPProtectionPanel.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionPanel.sys.mjs", }); async function setAndUpdateIsSignedOut(content, isSignedOut) { diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_content_signedout.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_content_signedout.js @@ -11,11 +11,12 @@ const { sinon } = ChromeUtils.importESModule( ); ChromeUtils.defineESModuleGetters(lazy, { - IPProtectionWidget: "resource:///modules/ipprotection/IPProtection.sys.mjs", + IPProtectionWidget: + "moz-src:///browser/components/ipprotection/IPProtection.sys.mjs", IPProtectionPanel: - "resource:///modules/ipprotection/IPProtectionPanel.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionPanel.sys.mjs", IPProtectionService: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", SpecialMessageActions: "resource://messaging-system/lib/SpecialMessageActions.sys.mjs", }); diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_header.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_header.js @@ -7,9 +7,10 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - IPProtectionWidget: "resource:///modules/ipprotection/IPProtection.sys.mjs", + IPProtectionWidget: + "moz-src:///browser/components/ipprotection/IPProtection.sys.mjs", IPProtectionPanel: - "resource:///modules/ipprotection/IPProtectionPanel.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionPanel.sys.mjs", }); /** diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_optout.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_optout.js @@ -7,7 +7,8 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - IPProtectionWidget: "resource:///modules/ipprotection/IPProtection.sys.mjs", + IPProtectionWidget: + "moz-src:///browser/components/ipprotection/IPProtection.sys.mjs", }); /** diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_panel.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_panel.js @@ -7,9 +7,10 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - IPProtectionWidget: "resource:///modules/ipprotection/IPProtection.sys.mjs", + IPProtectionWidget: + "moz-src:///browser/components/ipprotection/IPProtection.sys.mjs", IPProtectionPanel: - "resource:///modules/ipprotection/IPProtectionPanel.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionPanel.sys.mjs", }); /** diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_proxy_errors.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_proxy_errors.js @@ -5,10 +5,10 @@ "use strict"; const { IPPChannelFilter } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPChannelFilter.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPChannelFilter.sys.mjs" ); const { IPPNetworkErrorObserver } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPNetworkErrorObserver.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPNetworkErrorObserver.sys.mjs" ); add_task(async function test_createConnection_and_proxy() { diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js @@ -10,9 +10,10 @@ const { LINKS } = ChromeUtils.importESModule( const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - IPProtectionWidget: "resource:///modules/ipprotection/IPProtection.sys.mjs", + IPProtectionWidget: + "moz-src:///browser/components/ipprotection/IPProtection.sys.mjs", IPProtectionPanel: - "resource:///modules/ipprotection/IPProtectionPanel.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionPanel.sys.mjs", }); /** diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_telemetry.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_telemetry.js @@ -7,9 +7,10 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - IPPProxyManager: "resource:///modules/ipprotection/IPPProxyManager.sys.mjs", + IPPProxyManager: + "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs", IPProtectionService: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", }); const { ERRORS } = ChromeUtils.importESModule( diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_toolbar.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_toolbar.js @@ -7,11 +7,12 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - IPPProxyManager: "resource:///modules/ipprotection/IPPProxyManager.sys.mjs", + IPPProxyManager: + "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs", IPProtectionService: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", IPProtectionStates: - "resource:///modules/ipprotection/IPProtectionService.sys.mjs", + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs", }); /** diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_usage.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_usage.js @@ -5,10 +5,10 @@ "use strict"; const { IPPChannelFilter } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPChannelFilter.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPChannelFilter.sys.mjs" ); const { IPProtectionUsage } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPProtectionUsage.sys.mjs" + "moz-src:///browser/components/ipprotection/IPProtectionUsage.sys.mjs" ); add_task(async function test_createConnection_and_proxy() { diff --git a/browser/components/ipprotection/tests/browser/head.js b/browser/components/ipprotection/tests/browser/head.js @@ -2,27 +2,27 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ const { IPProtectionPanel } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPProtectionPanel.sys.mjs" + "moz-src:///browser/components/ipprotection/IPProtectionPanel.sys.mjs" ); const { IPProtection, IPProtectionWidget } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPProtection.sys.mjs" + "moz-src:///browser/components/ipprotection/IPProtection.sys.mjs" ); const { IPProtectionService, IPProtectionStates } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPProtectionService.sys.mjs" + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs" ); const { IPPProxyManager, IPPProxyStates } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPProxyManager.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs" ); const { IPPSignInWatcher } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPSignInWatcher.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPSignInWatcher.sys.mjs" ); const { IPPEnrollAndEntitleManager } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPEnrollAndEntitleManager.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs" ); const { HttpServer, HTTP_403 } = ChromeUtils.importESModule( @@ -34,7 +34,7 @@ const { NimbusTestUtils } = ChromeUtils.importESModule( ); const { Server } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPProtectionServerlist.sys.mjs" + "moz-src:///browser/components/ipprotection/IPProtectionServerlist.sys.mjs" ); ChromeUtils.defineESModuleGetters(this, { @@ -45,7 +45,7 @@ ChromeUtils.defineESModuleGetters(this, { }); const { ProxyPass } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/GuardianClient.sys.mjs" + "moz-src:///browser/components/ipprotection/GuardianClient.sys.mjs" ); const { RemoteSettings } = ChromeUtils.importESModule( "resource://services-settings/remote-settings.sys.mjs" diff --git a/browser/components/ipprotection/tests/xpcshell/head.js b/browser/components/ipprotection/tests/xpcshell/head.js @@ -5,16 +5,16 @@ "use strict"; const { IPProtectionService, IPProtectionStates } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPProtectionService.sys.mjs" + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs" ); const { IPPProxyManager, IPPProxyStates } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPProxyManager.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs" ); const { IPPSignInWatcher } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPSignInWatcher.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPSignInWatcher.sys.mjs" ); const { ProxyPass } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/GuardianClient.sys.mjs" + "moz-src:///browser/components/ipprotection/GuardianClient.sys.mjs" ); const { RemoteSettings } = ChromeUtils.importESModule( "resource://services-settings/remote-settings.sys.mjs" diff --git a/browser/components/ipprotection/tests/xpcshell/test_GuardianClient.js b/browser/components/ipprotection/tests/xpcshell/test_GuardianClient.js @@ -7,7 +7,7 @@ const { HttpServer, HTTP_404 } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" ); const { GuardianClient } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/GuardianClient.sys.mjs" + "moz-src:///browser/components/ipprotection/GuardianClient.sys.mjs" ); function makeGuardianServer( diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPPChannelFilter.js b/browser/components/ipprotection/tests/xpcshell/test_IPPChannelFilter.js @@ -5,11 +5,11 @@ "use strict"; const { IPPChannelFilter } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPChannelFilter.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPChannelFilter.sys.mjs" ); const { MasqueProtocol, ConnectProtocol, Server } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPProtectionServerlist.sys.mjs" + "moz-src:///browser/components/ipprotection/IPProtectionServerlist.sys.mjs" ); add_task(async function test_constructProxyInfo_masque_protocol() { diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPPExceptionsManager.js b/browser/components/ipprotection/tests/xpcshell/test_IPPExceptionsManager.js @@ -4,7 +4,7 @@ https://creativecommons.org/publicdomain/zero/1.0/ */ "use strict"; const { IPPExceptionsManager } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPExceptionsManager.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPExceptionsManager.sys.mjs" ); const ONBOARDING_MESSAGE_MASK_PREF = diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPPOnboardingMessageHelper.js b/browser/components/ipprotection/tests/xpcshell/test_IPPOnboardingMessageHelper.js @@ -5,7 +5,7 @@ "use strict"; const { IPPOnboardingMessage } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPOnboardingMessageHelper.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPOnboardingMessageHelper.sys.mjs" ); const { ONBOARDING_PREF_FLAGS } = ChromeUtils.importESModule( "chrome://browser/content/ipprotection/ipprotection-constants.mjs" diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPPStartupCache.js b/browser/components/ipprotection/tests/xpcshell/test_IPPStartupCache.js @@ -5,7 +5,7 @@ "use strict"; const { IPPStartupCacheSingleton } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPStartupCache.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPStartupCache.sys.mjs" ); /** diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPProtection.js b/browser/components/ipprotection/tests/xpcshell/test_IPProtection.js @@ -4,7 +4,7 @@ https://creativecommons.org/publicdomain/zero/1.0/ */ "use strict"; const { IPProtection } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPProtection.sys.mjs" + "moz-src:///browser/components/ipprotection/IPProtection.sys.mjs" ); /** diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPProtectionPanel.js b/browser/components/ipprotection/tests/xpcshell/test_IPProtectionPanel.js @@ -4,10 +4,10 @@ https://creativecommons.org/publicdomain/zero/1.0/ */ "use strict"; const { IPProtectionPanel } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPProtectionPanel.sys.mjs" + "moz-src:///browser/components/ipprotection/IPProtectionPanel.sys.mjs" ); const { IPPEnrollAndEntitleManager } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPEnrollAndEntitleManager.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs" ); /** diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPProtectionServerlist.js b/browser/components/ipprotection/tests/xpcshell/test_IPProtectionServerlist.js @@ -9,7 +9,7 @@ const { RemoteSettingsServerlist, IPProtectionServerlistFactory, } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPProtectionServerlist.sys.mjs" + "moz-src:///browser/components/ipprotection/IPProtectionServerlist.sys.mjs" ); const COLLECTION_NAME = "vpn-serverlist"; diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPProtectionService.js b/browser/components/ipprotection/tests/xpcshell/test_IPProtectionService.js @@ -10,7 +10,7 @@ const { ExtensionTestUtils } = ChromeUtils.importESModule( "resource://testing-common/ExtensionXPCShellUtils.sys.mjs" ); const { IPPEnrollAndEntitleManager } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPEnrollAndEntitleManager.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs" ); do_get_profile(); diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPProtectionStates.js b/browser/components/ipprotection/tests/xpcshell/test_IPProtectionStates.js @@ -4,10 +4,10 @@ https://creativecommons.org/publicdomain/zero/1.0/ */ "use strict"; const { IPPNimbusHelper } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPNimbusHelper.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPNimbusHelper.sys.mjs" ); const { IPPEnrollAndEntitleManager } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPEnrollAndEntitleManager.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs" ); do_get_profile(); diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPProtectionUsage.js b/browser/components/ipprotection/tests/xpcshell/test_IPProtectionUsage.js @@ -4,7 +4,7 @@ https://creativecommons.org/publicdomain/zero/1.0/ */ "use strict"; const { IPProtectionUsage } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPProtectionUsage.sys.mjs" + "moz-src:///browser/components/ipprotection/IPProtectionUsage.sys.mjs" ); const { HttpServer } = ChromeUtils.importESModule( "resource://testing-common/httpd.sys.mjs" diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPProxyManager.js b/browser/components/ipprotection/tests/xpcshell/test_IPProxyManager.js @@ -5,7 +5,7 @@ "use strict"; const { IPPEnrollAndEntitleManager } = ChromeUtils.importESModule( - "resource:///modules/ipprotection/IPPEnrollAndEntitleManager.sys.mjs" + "moz-src:///browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs" ); add_setup(async function () { diff --git a/browser/extensions/ipp-activator/extension/api/parent/ext-ipp.js b/browser/extensions/ipp-activator/extension/api/parent/ext-ipp.js @@ -7,8 +7,10 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs", - IPPProxyManager: "resource:///modules/ipprotection/IPPProxyManager.sys.mjs", - IPPProxyStates: "resource:///modules/ipprotection/IPPProxyManager.sys.mjs", + IPPProxyManager: + "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs", + IPPProxyStates: + "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs", }); ChromeUtils.defineLazyGetter(lazy, "tabTracker", () => { diff --git a/tools/@types/generated/lib.gecko.modules.d.ts b/tools/@types/generated/lib.gecko.modules.d.ts @@ -506,24 +506,24 @@ export interface Modules { "resource:///modules/distribution.sys.mjs": typeof import("resource:///modules/distribution.sys.mjs"), "resource:///modules/firefox-view-synced-tabs-error-handler.sys.mjs": typeof import("resource:///modules/firefox-view-synced-tabs-error-handler.sys.mjs"), "resource:///modules/firefox-view-tabs-setup-manager.sys.mjs": typeof import("resource:///modules/firefox-view-tabs-setup-manager.sys.mjs"), - "resource:///modules/ipprotection/GuardianClient.sys.mjs": typeof import("resource:///modules/ipprotection/GuardianClient.sys.mjs"), - "resource:///modules/ipprotection/IPPChannelFilter.sys.mjs": typeof import("resource:///modules/ipprotection/IPPChannelFilter.sys.mjs"), - "resource:///modules/ipprotection/IPPEnrollAndEntitleManager.sys.mjs": typeof import("resource:///modules/ipprotection/IPPEnrollAndEntitleManager.sys.mjs"), - "resource:///modules/ipprotection/IPPExceptionsManager.sys.mjs": typeof import("resource:///modules/ipprotection/IPPExceptionsManager.sys.mjs"), - "resource:///modules/ipprotection/IPPNetworkErrorObserver.sys.mjs": typeof import("resource:///modules/ipprotection/IPPNetworkErrorObserver.sys.mjs"), - "resource:///modules/ipprotection/IPPNimbusHelper.sys.mjs": typeof import("resource:///modules/ipprotection/IPPNimbusHelper.sys.mjs"), - "resource:///modules/ipprotection/IPPOnboardingMessageHelper.sys.mjs": typeof import("resource:///modules/ipprotection/IPPOnboardingMessageHelper.sys.mjs"), - "resource:///modules/ipprotection/IPPOptOutHelper.sys.mjs": typeof import("resource:///modules/ipprotection/IPPOptOutHelper.sys.mjs"), - "resource:///modules/ipprotection/IPPProxyManager.sys.mjs": typeof import("resource:///modules/ipprotection/IPPProxyManager.sys.mjs"), - "resource:///modules/ipprotection/IPPSignInWatcher.sys.mjs": typeof import("resource:///modules/ipprotection/IPPSignInWatcher.sys.mjs"), - "resource:///modules/ipprotection/IPPStartupCache.sys.mjs": typeof import("resource:///modules/ipprotection/IPPStartupCache.sys.mjs"), - "resource:///modules/ipprotection/IPPVPNAddonHelper.sys.mjs": typeof import("resource:///modules/ipprotection/IPPVPNAddonHelper.sys.mjs"), - "resource:///modules/ipprotection/IPProtection.sys.mjs": typeof import("resource:///modules/ipprotection/IPProtection.sys.mjs"), - "resource:///modules/ipprotection/IPProtectionHelpers.sys.mjs": typeof import("resource:///modules/ipprotection/IPProtectionHelpers.sys.mjs"), - "resource:///modules/ipprotection/IPProtectionPanel.sys.mjs": typeof import("resource:///modules/ipprotection/IPProtectionPanel.sys.mjs"), - "resource:///modules/ipprotection/IPProtectionServerlist.sys.mjs": typeof import("resource:///modules/ipprotection/IPProtectionServerlist.sys.mjs"), - "resource:///modules/ipprotection/IPProtectionService.sys.mjs": typeof import("resource:///modules/ipprotection/IPProtectionService.sys.mjs"), - "resource:///modules/ipprotection/IPProtectionUsage.sys.mjs": typeof import("resource:///modules/ipprotection/IPProtectionUsage.sys.mjs"), + "moz-src:///browser/components/ipprotection/GuardianClient.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/GuardianClient.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPPChannelFilter.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPChannelFilter.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPPExceptionsManager.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPExceptionsManager.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPPNetworkErrorObserver.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPNetworkErrorObserver.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPPNimbusHelper.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPNimbusHelper.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPPOnboardingMessageHelper.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPOnboardingMessageHelper.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPPOptOutHelper.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPOptOutHelper.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPPSignInWatcher.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPSignInWatcher.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPPStartupCache.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPStartupCache.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPPVPNAddonHelper.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPVPNAddonHelper.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPProtection.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPProtection.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPProtectionHelpers.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPProtectionHelpers.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPProtectionPanel.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPProtectionPanel.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPProtectionServerlist.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPProtectionServerlist.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs"), + "moz-src:///browser/components/ipprotection/IPProtectionUsage.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPProtectionUsage.sys.mjs"), "resource:///modules/policies/BookmarksPolicies.sys.mjs": typeof import("resource:///modules/policies/BookmarksPolicies.sys.mjs"), "resource:///modules/policies/Policies.sys.mjs": typeof import("resource:///modules/policies/Policies.sys.mjs"), "resource:///modules/policies/ProxyPolicies.sys.mjs": typeof import("resource:///modules/policies/ProxyPolicies.sys.mjs"), diff --git a/tools/@types/generated/tspaths.json b/tools/@types/generated/tspaths.json @@ -1334,61 +1334,61 @@ "resource:///modules/firefox-view-tabs-setup-manager.sys.mjs": [ "browser/components/firefoxview/firefox-view-tabs-setup-manager.sys.mjs" ], - "resource:///modules/ipprotection/GuardianClient.sys.mjs": [ + "moz-src:///browser/components/ipprotection/GuardianClient.sys.mjs": [ "browser/components/ipprotection/GuardianClient.sys.mjs" ], - "resource:///modules/ipprotection/IPPAutoStart.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPPAutoStart.sys.mjs": [ "browser/components/ipprotection/IPPAutoStart.sys.mjs" ], - "resource:///modules/ipprotection/IPPChannelFilter.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPPChannelFilter.sys.mjs": [ "browser/components/ipprotection/IPPChannelFilter.sys.mjs" ], - "resource:///modules/ipprotection/IPPEnrollAndEntitleManager.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs": [ "browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs" ], - "resource:///modules/ipprotection/IPPExceptionsManager.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPPExceptionsManager.sys.mjs": [ "browser/components/ipprotection/IPPExceptionsManager.sys.mjs" ], - "resource:///modules/ipprotection/IPPNetworkErrorObserver.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPPNetworkErrorObserver.sys.mjs": [ "browser/components/ipprotection/IPPNetworkErrorObserver.sys.mjs" ], - "resource:///modules/ipprotection/IPPNimbusHelper.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPPNimbusHelper.sys.mjs": [ "browser/components/ipprotection/IPPNimbusHelper.sys.mjs" ], - "resource:///modules/ipprotection/IPPOnboardingMessageHelper.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPPOnboardingMessageHelper.sys.mjs": [ "browser/components/ipprotection/IPPOnboardingMessageHelper.sys.mjs" ], - "resource:///modules/ipprotection/IPPOptOutHelper.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPPOptOutHelper.sys.mjs": [ "browser/components/ipprotection/IPPOptOutHelper.sys.mjs" ], - "resource:///modules/ipprotection/IPPProxyManager.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs": [ "browser/components/ipprotection/IPPProxyManager.sys.mjs" ], - "resource:///modules/ipprotection/IPPSignInWatcher.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPPSignInWatcher.sys.mjs": [ "browser/components/ipprotection/IPPSignInWatcher.sys.mjs" ], - "resource:///modules/ipprotection/IPPStartupCache.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPPStartupCache.sys.mjs": [ "browser/components/ipprotection/IPPStartupCache.sys.mjs" ], - "resource:///modules/ipprotection/IPPVPNAddonHelper.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPPVPNAddonHelper.sys.mjs": [ "browser/components/ipprotection/IPPVPNAddonHelper.sys.mjs" ], - "resource:///modules/ipprotection/IPProtection.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPProtection.sys.mjs": [ "browser/components/ipprotection/IPProtection.sys.mjs" ], - "resource:///modules/ipprotection/IPProtectionHelpers.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPProtectionHelpers.sys.mjs": [ "browser/components/ipprotection/IPProtectionHelpers.sys.mjs" ], - "resource:///modules/ipprotection/IPProtectionPanel.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPProtectionPanel.sys.mjs": [ "browser/components/ipprotection/IPProtectionPanel.sys.mjs" ], - "resource:///modules/ipprotection/IPProtectionServerlist.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPProtectionServerlist.sys.mjs": [ "browser/components/ipprotection/IPProtectionServerlist.sys.mjs" ], - "resource:///modules/ipprotection/IPProtectionService.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs": [ "browser/components/ipprotection/IPProtectionService.sys.mjs" ], - "resource:///modules/ipprotection/IPProtectionUsage.sys.mjs": [ + "moz-src:///browser/components/ipprotection/IPProtectionUsage.sys.mjs": [ "browser/components/ipprotection/IPProtectionUsage.sys.mjs" ], "resource:///modules/policies/BookmarksPolicies.sys.mjs": [