commit 091d1f53bd22e6f0c8dfef8262e4313c08f04632 parent 9416aad3a6354e1362cb9f35fb63859e61aab624 Author: Atila Butkovits <abutkovits@mozilla.com> Date: Fri, 17 Oct 2025 15:49:58 +0300 Revert "Bug 1993543 - Simplify XPCOMUtils.defineLazyServiceGetter to require the interface parameter as an nsIID. r=spidermonkey-reviewers,frontend-codestyle-reviewers,Gijs,arai" for causing Reftest failures. This reverts commit d96e9bd92c21f9576e858ce240757549d2ffb046. Revert "Bug 1993543 - Change XPCOMUtils.defineLazyServiceGetter(s) calls to pass an nsIID rather than a string. r=firefox-desktop-core-reviewers ,mtigley,joschmidt,perftest-reviewers,home-newtab-reviewers,nbarrett,Gijs,sparky" This reverts commit 024c584172aec2b37e8465b395c3b92029f2b8c5. Diffstat:
238 files changed, 354 insertions(+), 362 deletions(-)
diff --git a/browser/actors/AboutProtectionsParent.sys.mjs b/browser/actors/AboutProtectionsParent.sys.mjs @@ -27,7 +27,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "TrackingDBService", "@mozilla.org/tracking-db-service;1", - Ci.nsITrackingDBService + "nsITrackingDBService" ); let idToTextMap = new Map([ diff --git a/browser/actors/ContextMenuParent.sys.mjs b/browser/actors/ContextMenuParent.sys.mjs @@ -14,7 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, { }); XPCOMUtils.defineLazyServiceGetters(lazy, { - BrowserHandler: ["@mozilla.org/browser/clh;1", Ci.nsIBrowserHandler], + BrowserHandler: ["@mozilla.org/browser/clh;1", "nsIBrowserHandler"], }); export class ContextMenuParent extends JSWindowActorParent { diff --git a/browser/actors/WebRTCChild.sys.mjs b/browser/actors/WebRTCChild.sys.mjs @@ -10,7 +10,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "MediaManagerService", "@mozilla.org/mediaManagerService;1", - Ci.nsIMediaManagerService + "nsIMediaManagerService" ); const kBrowserURL = AppConstants.BROWSER_CHROME_URL; diff --git a/browser/actors/WebRTCParent.sys.mjs b/browser/actors/WebRTCParent.sys.mjs @@ -16,7 +16,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "OSPermissions", "@mozilla.org/ospermissionrequest;1", - Ci.nsIOSPermissionRequest + "nsIOSPermissionRequest" ); export class WebRTCParent extends JSWindowActorParent { diff --git a/browser/base/content/aboutDialog-appUpdater.js b/browser/base/content/aboutDialog-appUpdater.js @@ -21,7 +21,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "AUS", "@mozilla.org/updates/update-service;1", - Ci.nsIApplicationUpdateService + "nsIApplicationUpdateService" ); var UPDATING_MIN_DISPLAY_TIME_MS = 1500; diff --git a/browser/base/content/browser-siteProtections.js b/browser/base/content/browser-siteProtections.js @@ -15,7 +15,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "TrackingDBService", "@mozilla.org/tracking-db-service;1", - Ci.nsITrackingDBService + "nsITrackingDBService" ); /** diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js @@ -306,15 +306,15 @@ XPCOMUtils.defineLazyScriptGetter( XPCOMUtils.defineLazyServiceGetters(this, { ContentPrefService2: [ "@mozilla.org/content-pref/service;1", - Ci.nsIContentPrefService2, + "nsIContentPrefService2", ], classifierService: [ "@mozilla.org/url-classifier/dbservice;1", - Ci.nsIURIClassifier, + "nsIURIClassifier", ], - Favicons: ["@mozilla.org/browser/favicon-service;1", Ci.nsIFaviconService], - WindowsUIUtils: ["@mozilla.org/windows-ui-utils;1", Ci.nsIWindowsUIUtils], - BrowserHandler: ["@mozilla.org/browser/clh;1", Ci.nsIBrowserHandler], + Favicons: ["@mozilla.org/browser/favicon-service;1", "nsIFaviconService"], + WindowsUIUtils: ["@mozilla.org/windows-ui-utils;1", "nsIWindowsUIUtils"], + BrowserHandler: ["@mozilla.org/browser/clh;1", "nsIBrowserHandler"], }); if (AppConstants.ENABLE_WEBDRIVER) { @@ -322,14 +322,14 @@ if (AppConstants.ENABLE_WEBDRIVER) { this, "Marionette", "@mozilla.org/remote/marionette;1", - Ci.nsIMarionette + "nsIMarionette" ); XPCOMUtils.defineLazyServiceGetter( this, "RemoteAgent", "@mozilla.org/remote/agent;1", - Ci.nsIRemoteAgent + "nsIRemoteAgent" ); } else { this.Marionette = { running: false }; diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs @@ -75,14 +75,14 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "QueryStringStripper", "@mozilla.org/url-query-string-stripper;1", - Ci.nsIURLQueryStringStripper + "nsIURLQueryStringStripper" ); XPCOMUtils.defineLazyServiceGetter( lazy, "clipboard", "@mozilla.org/widget/clipboardhelper;1", - Ci.nsIClipboardHelper + "nsIClipboardHelper" ); XPCOMUtils.defineLazyPreferenceGetter( diff --git a/browser/base/content/test/about/browser_aboutNetError.js b/browser/base/content/test/about/browser_aboutNetError.js @@ -14,7 +14,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gDNSOverride", "@mozilla.org/network/native-dns-override;1", - Ci.nsINativeDNSResolverOverride + "nsINativeDNSResolverOverride" ); // This includes all the cipher suite prefs we have. diff --git a/browser/base/content/test/captivePortal/head.js b/browser/base/content/test/captivePortal/head.js @@ -2,7 +2,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "cps", "@mozilla.org/network/captive-portal-service;1", - Ci.nsICaptivePortalService + "nsICaptivePortalService" ); const CANONICAL_CONTENT = "success"; diff --git a/browser/base/content/test/protectionsUI/head.js b/browser/base/content/test/protectionsUI/head.js @@ -9,7 +9,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "TrackingDBService", "@mozilla.org/tracking-db-service;1", - Ci.nsITrackingDBService + "nsITrackingDBService" ); ChromeUtils.defineLazyGetter(this, "TRACK_DB_PATH", function () { diff --git a/browser/base/content/test/sanitize/browser_sanitize-offlineData.js b/browser/base/content/test/sanitize/browser_sanitize-offlineData.js @@ -14,13 +14,13 @@ XPCOMUtils.defineLazyServiceGetter( this, "sas", "@mozilla.org/storage/activity-service;1", - Ci.nsIStorageActivityService + "nsIStorageActivityService" ); XPCOMUtils.defineLazyServiceGetter( this, "swm", "@mozilla.org/serviceworkers/manager;1", - Ci.nsIServiceWorkerManager + "nsIServiceWorkerManager" ); const oneHour = 3600000000; diff --git a/browser/base/content/webrtcIndicator.js b/browser/base/content/webrtcIndicator.js @@ -16,7 +16,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "gScreenManager", "@mozilla.org/gfx/screenmanager;1", - Ci.nsIScreenManager + "nsIScreenManager" ); /** diff --git a/browser/components/AccountsGlue.sys.mjs b/browser/components/AccountsGlue.sys.mjs @@ -28,7 +28,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "AlertsService", "@mozilla.org/alerts-service;1", - Ci.nsIAlertsService + "nsIAlertsService" ); ChromeUtils.defineLazyGetter( diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs @@ -26,9 +26,9 @@ ChromeUtils.defineESModuleGetters(lazy, { }); XPCOMUtils.defineLazyServiceGetters(lazy, { - UpdateManager: ["@mozilla.org/updates/update-manager;1", Ci.nsIUpdateManager], - WinTaskbar: ["@mozilla.org/windows-taskbar;1", Ci.nsIWinTaskbar], - WindowsUIUtils: ["@mozilla.org/windows-ui-utils;1", Ci.nsIWindowsUIUtils], + UpdateManager: ["@mozilla.org/updates/update-manager;1", "nsIUpdateManager"], + WinTaskbar: ["@mozilla.org/windows-taskbar;1", "nsIWinTaskbar"], + WindowsUIUtils: ["@mozilla.org/windows-ui-utils;1", "nsIWindowsUIUtils"], }); ChromeUtils.defineLazyGetter(lazy, "gSystemPrincipal", () => diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs @@ -77,8 +77,8 @@ ChromeUtils.defineESModuleGetters(lazy, { }); XPCOMUtils.defineLazyServiceGetters(lazy, { - BrowserHandler: ["@mozilla.org/browser/clh;1", Ci.nsIBrowserHandler], - PushService: ["@mozilla.org/push/Service;1", Ci.nsIPushService], + BrowserHandler: ["@mozilla.org/browser/clh;1", "nsIBrowserHandler"], + PushService: ["@mozilla.org/push/Service;1", "nsIPushService"], }); if (AppConstants.ENABLE_WEBDRIVER) { @@ -86,14 +86,14 @@ if (AppConstants.ENABLE_WEBDRIVER) { lazy, "Marionette", "@mozilla.org/remote/marionette;1", - Ci.nsIMarionette + "nsIMarionette" ); XPCOMUtils.defineLazyServiceGetter( lazy, "RemoteAgent", "@mozilla.org/remote/agent;1", - Ci.nsIRemoteAgent + "nsIRemoteAgent" ); } else { lazy.Marionette = { running: false }; @@ -153,7 +153,7 @@ export function BrowserGlue() { this, "_userIdleService", "@mozilla.org/widget/useridleservice;1", - Ci.nsIUserIdleService + "nsIUserIdleService" ); this._init(); diff --git a/browser/components/aboutlogins/AboutLoginsChild.sys.mjs b/browser/components/aboutlogins/AboutLoginsChild.sys.mjs @@ -12,7 +12,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "ClipboardHelper", "@mozilla.org/widget/clipboardhelper;1", - Ci.nsIClipboardHelper + "nsIClipboardHelper" ); const TELEMETRY_MIN_MS_BETWEEN_OPEN_MANAGEMENT = 5000; diff --git a/browser/components/asrouter/modules/ASRouter.sys.mjs b/browser/components/asrouter/modules/ASRouter.sys.mjs @@ -77,7 +77,7 @@ XPCOMUtils.defineLazyPreferenceGetter( ); XPCOMUtils.defineLazyServiceGetters(lazy, { - BrowserHandler: ["@mozilla.org/browser/clh;1", Ci.nsIBrowserHandler], + BrowserHandler: ["@mozilla.org/browser/clh;1", "nsIBrowserHandler"], }); import { MESSAGING_EXPERIMENTS_DEFAULT_FEATURES } from "resource:///modules/asrouter/MessagingExperimentConstants.sys.mjs"; import { CFRMessageProvider } from "resource:///modules/asrouter/CFRMessageProvider.sys.mjs"; diff --git a/browser/components/asrouter/modules/ASRouterTargeting.sys.mjs b/browser/components/asrouter/modules/ASRouterTargeting.sys.mjs @@ -202,20 +202,14 @@ XPCOMUtils.defineLazyPreferenceGetter( ); XPCOMUtils.defineLazyServiceGetters(lazy, { - AUS: [ - "@mozilla.org/updates/update-service;1", - Ci.nsIApplicationUpdateService, - ], - BrowserHandler: ["@mozilla.org/browser/clh;1", Ci.nsIBrowserHandler], - ScreenManager: ["@mozilla.org/gfx/screenmanager;1", Ci.nsIScreenManager], + AUS: ["@mozilla.org/updates/update-service;1", "nsIApplicationUpdateService"], + BrowserHandler: ["@mozilla.org/browser/clh;1", "nsIBrowserHandler"], + ScreenManager: ["@mozilla.org/gfx/screenmanager;1", "nsIScreenManager"], TrackingDBService: [ "@mozilla.org/tracking-db-service;1", - Ci.nsITrackingDBService, - ], - UpdateCheckSvc: [ - "@mozilla.org/updates/update-checker;1", - Ci.nsIUpdateChecker, + "nsITrackingDBService", ], + UpdateCheckSvc: ["@mozilla.org/updates/update-checker;1", "nsIUpdateChecker"], }); const FXA_USERNAME_PREF = "services.sync.username"; diff --git a/browser/components/asrouter/modules/CFRPageActions.sys.mjs b/browser/components/asrouter/modules/CFRPageActions.sys.mjs @@ -26,7 +26,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "TrackingDBService", "@mozilla.org/tracking-db-service;1", - Ci.nsITrackingDBService + "nsITrackingDBService" ); XPCOMUtils.defineLazyPreferenceGetter( lazy, diff --git a/browser/components/asrouter/modules/ToastNotification.sys.mjs b/browser/components/asrouter/modules/ToastNotification.sys.mjs @@ -13,7 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, { }); XPCOMUtils.defineLazyServiceGetters(lazy, { - AlertsService: ["@mozilla.org/alerts-service;1", Ci.nsIAlertsService], + AlertsService: ["@mozilla.org/alerts-service;1", "nsIAlertsService"], }); export const ToastNotification = { diff --git a/browser/components/backup/BackupService.sys.mjs b/browser/components/backup/BackupService.sys.mjs @@ -185,7 +185,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "idleService", "@mozilla.org/widget/useridleservice;1", - Ci.nsIUserIdleService + "nsIUserIdleService" ); XPCOMUtils.defineLazyServiceGetter( diff --git a/browser/components/customizableui/CustomizeMode.sys.mjs b/browser/components/customizableui/CustomizeMode.sys.mjs @@ -39,7 +39,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gTouchBarUpdater", "@mozilla.org/widget/touchbarupdater;1", - Ci.nsITouchBarUpdater + "nsITouchBarUpdater" ); let gDebug; diff --git a/browser/components/downloads/DownloadsCommon.sys.mjs b/browser/components/downloads/DownloadsCommon.sys.mjs @@ -43,9 +43,9 @@ ChromeUtils.defineESModuleGetters(lazy, { XPCOMUtils.defineLazyServiceGetters(lazy, { gClipboardHelper: [ "@mozilla.org/widget/clipboardhelper;1", - Ci.nsIClipboardHelper, + "nsIClipboardHelper", ], - gMIMEService: ["@mozilla.org/mime;1", Ci.nsIMIMEService], + gMIMEService: ["@mozilla.org/mime;1", "nsIMIMEService"], }); ChromeUtils.defineLazyGetter(lazy, "DownloadsLogger", () => { diff --git a/browser/components/downloads/DownloadsViewUI.sys.mjs b/browser/components/downloads/DownloadsViewUI.sys.mjs @@ -25,7 +25,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "handlerSvc", "@mozilla.org/uriloader/handler-service;1", - Ci.nsIHandlerService + "nsIHandlerService" ); XPCOMUtils.defineLazyServiceGetter( diff --git a/browser/components/downloads/DownloadsViewableInternally.sys.mjs b/browser/components/downloads/DownloadsViewableInternally.sys.mjs @@ -16,13 +16,13 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "HandlerService", "@mozilla.org/uriloader/handler-service;1", - Ci.nsIHandlerService + "nsIHandlerService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "MIMEService", "@mozilla.org/mime;1", - Ci.nsIMIMEService + "nsIMIMEService" ); ChromeUtils.defineESModuleGetters(lazy, { diff --git a/browser/components/enterprisepolicies/Policies.sys.mjs b/browser/components/enterprisepolicies/Policies.sys.mjs @@ -9,16 +9,16 @@ import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs"; const lazy = {}; XPCOMUtils.defineLazyServiceGetters(lazy, { - gCertDB: ["@mozilla.org/security/x509certdb;1", Ci.nsIX509CertDB], + gCertDB: ["@mozilla.org/security/x509certdb;1", "nsIX509CertDB"], gExternalProtocolService: [ "@mozilla.org/uriloader/external-protocol-service;1", - Ci.nsIExternalProtocolService, + "nsIExternalProtocolService", ], gHandlerService: [ "@mozilla.org/uriloader/handler-service;1", - Ci.nsIHandlerService, + "nsIHandlerService", ], - gMIMEService: ["@mozilla.org/mime;1", Ci.nsIMIMEService], + gMIMEService: ["@mozilla.org/mime;1", "nsIMIMEService"], }); ChromeUtils.defineESModuleGetters(lazy, { diff --git a/browser/components/extensions/parent/ext-pkcs11.js b/browser/components/extensions/parent/ext-pkcs11.js @@ -13,7 +13,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "pkcs11db", "@mozilla.org/security/pkcs11moduledb;1", - Ci.nsIPKCS11ModuleDB + "nsIPKCS11ModuleDB" ); // eslint-disable-next-line mozilla/reject-importGlobalProperties diff --git a/browser/components/firefoxview/firefox-view-synced-tabs-error-handler.sys.mjs b/browser/components/firefoxview/firefox-view-synced-tabs-error-handler.sys.mjs @@ -24,7 +24,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gNetworkLinkService", "@mozilla.org/network/network-link-service;1", - Ci.nsINetworkLinkService + "nsINetworkLinkService" ); const FXA_ENABLED = "identity.fxaccounts.enabled"; diff --git a/browser/components/migration/ChromeMacOSLoginCrypto.sys.mjs b/browser/components/migration/ChromeMacOSLoginCrypto.sys.mjs @@ -15,7 +15,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gKeychainUtils", "@mozilla.org/profile/migrator/keychainmigrationutils;1", - Ci.nsIKeychainMigrationUtils + "nsIKeychainMigrationUtils" ); const gTextEncoder = new TextEncoder(); diff --git a/browser/components/mozcachedohttp/MozCachedOHTTPProtocolHandler.sys.mjs b/browser/components/mozcachedohttp/MozCachedOHTTPProtocolHandler.sys.mjs @@ -16,7 +16,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "obliviousHttpService", "@mozilla.org/network/oblivious-http-service;1", - Ci.nsIObliviousHttpService + "nsIObliviousHttpService" ); /** diff --git a/browser/components/newtab/SponsorProtection.sys.mjs b/browser/components/newtab/SponsorProtection.sys.mjs @@ -10,7 +10,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "ProxyService", "@mozilla.org/network/protocol-proxy-service;1", - Ci.nsIProtocolProxyService + "nsIProtocolProxyService" ); ChromeUtils.defineLazyGetter(lazy, "logConsole", function () { diff --git a/browser/components/pagedata/PageDataService.sys.mjs b/browser/components/pagedata/PageDataService.sys.mjs @@ -23,7 +23,7 @@ ChromeUtils.defineLazyGetter(lazy, "logConsole", function () { }); XPCOMUtils.defineLazyServiceGetters(lazy, { - idleService: ["@mozilla.org/widget/useridleservice;1", Ci.nsIUserIdleService], + idleService: ["@mozilla.org/widget/useridleservice;1", "nsIUserIdleService"], }); XPCOMUtils.defineLazyPreferenceGetter( diff --git a/browser/components/places/Interactions.sys.mjs b/browser/components/places/Interactions.sys.mjs @@ -29,7 +29,7 @@ ChromeUtils.defineLazyGetter(lazy, "logConsole", function () { }); XPCOMUtils.defineLazyServiceGetters(lazy, { - idleService: ["@mozilla.org/widget/useridleservice;1", Ci.nsIUserIdleService], + idleService: ["@mozilla.org/widget/useridleservice;1", "nsIUserIdleService"], }); XPCOMUtils.defineLazyPreferenceGetter( diff --git a/browser/components/places/PlacesBrowserStartup.sys.mjs b/browser/components/places/PlacesBrowserStartup.sys.mjs @@ -17,10 +17,10 @@ ChromeUtils.defineESModuleGetters(lazy, { }); XPCOMUtils.defineLazyServiceGetters(lazy, { - BrowserHandler: ["@mozilla.org/browser/clh;1", Ci.nsIBrowserHandler], + BrowserHandler: ["@mozilla.org/browser/clh;1", "nsIBrowserHandler"], UserIdleService: [ "@mozilla.org/widget/useridleservice;1", - Ci.nsIUserIdleService, + "nsIUserIdleService", ], }); diff --git a/browser/components/places/content/controller.js b/browser/components/places/content/controller.js @@ -1738,5 +1738,5 @@ XPCOMUtils.defineLazyServiceGetter( PlacesControllerDragHelper, "dragService", "@mozilla.org/widget/dragservice;1", - Ci.nsIDragService + "nsIDragService" ); diff --git a/browser/components/preferences/dialogs/permissions.js b/browser/components/preferences/dialogs/permissions.js @@ -16,7 +16,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "contentBlockingAllowList", "@mozilla.org/content-blocking-allow-list;1", - Ci.nsIContentBlockingAllowList + "nsIContentBlockingAllowList" ); const permissionExceptionsL10n = { diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js @@ -51,18 +51,18 @@ var fxAccounts = getFxAccountsSingleton(); XPCOMUtils.defineLazyServiceGetters(this, { gApplicationUpdateService: [ "@mozilla.org/updates/update-service;1", - Ci.nsIApplicationUpdateService, + "nsIApplicationUpdateService", ], listManager: [ "@mozilla.org/url-classifier/listmanager;1", - Ci.nsIUrlListManager, + "nsIUrlListManager", ], gHandlerService: [ "@mozilla.org/uriloader/handler-service;1", - Ci.nsIHandlerService, + "nsIHandlerService", ], - gMIMEService: ["@mozilla.org/mime;1", Ci.nsIMIMEService], + gMIMEService: ["@mozilla.org/mime;1", "nsIMIMEService"], }); if (Cc["@mozilla.org/gio-service;1"]) { @@ -70,7 +70,7 @@ if (Cc["@mozilla.org/gio-service;1"]) { this, "gGIOService", "@mozilla.org/gio-service;1", - Ci.nsIGIOService + "nsIGIOService" ); } else { this.gGIOService = null; diff --git a/browser/components/preferences/privacy.js b/browser/components/preferences/privacy.js @@ -66,7 +66,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "TrackingDBService", "@mozilla.org/tracking-db-service;1", - Ci.nsITrackingDBService + "nsITrackingDBService" ); XPCOMUtils.defineLazyPreferenceGetter( diff --git a/browser/components/preferences/tests/siteData/head.js b/browser/components/preferences/tests/siteData/head.js @@ -34,7 +34,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "serviceWorkerManager", "@mozilla.org/serviceworkers/manager;1", - Ci.nsIServiceWorkerManager + "nsIServiceWorkerManager" ); function promiseSiteDataManagerSitesUpdated() { diff --git a/browser/components/protections/test/browser/browser_protections_report_ui.js b/browser/components/protections/test/browser/browser_protections_report_ui.js @@ -15,7 +15,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "TrackingDBService", "@mozilla.org/tracking-db-service;1", - Ci.nsITrackingDBService + "nsITrackingDBService" ); ChromeUtils.defineLazyGetter(this, "DB_PATH", function () { diff --git a/browser/components/protections/test/browser/browser_protections_telemetry.js b/browser/components/protections/test/browser/browser_protections_telemetry.js @@ -7,7 +7,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "TrackingDBService", "@mozilla.org/tracking-db-service;1", - Ci.nsITrackingDBService + "nsITrackingDBService" ); const { AboutProtectionsParent } = ChromeUtils.importESModule( diff --git a/browser/components/protocolhandler/WebProtocolHandlerRegistrar.sys.mjs b/browser/components/protocolhandler/WebProtocolHandlerRegistrar.sys.mjs @@ -14,7 +14,7 @@ const lazy = {}; XPCOMUtils.defineLazyServiceGetters(lazy, { ExternalProtocolService: [ "@mozilla.org/uriloader/external-protocol-service;1", - Ci.nsIExternalProtocolService, + "nsIExternalProtocolService", ], }); diff --git a/browser/components/screenshots/ScreenshotsUtils.sys.mjs b/browser/components/screenshots/ScreenshotsUtils.sys.mjs @@ -23,7 +23,7 @@ ChromeUtils.defineESModuleGetters(lazy, { }); XPCOMUtils.defineLazyServiceGetters(lazy, { - AlertsService: ["@mozilla.org/alerts-service;1", Ci.nsIAlertsService], + AlertsService: ["@mozilla.org/alerts-service;1", "nsIAlertsService"], }); XPCOMUtils.defineLazyPreferenceGetter( diff --git a/browser/components/search/test/browser/browser_searchbar_context.js b/browser/components/search/test/browser/browser_searchbar_context.js @@ -13,7 +13,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "clipboardHelper", "@mozilla.org/widget/clipboardhelper;1", - Ci.nsIClipboardHelper + "nsIClipboardHelper" ); add_setup(async function () { diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs @@ -169,7 +169,7 @@ import { GlobalState } from "resource:///modules/sessionstore/GlobalState.sys.mj const lazy = {}; XPCOMUtils.defineLazyServiceGetters(lazy, { - gScreenManager: ["@mozilla.org/gfx/screenmanager;1", Ci.nsIScreenManager], + gScreenManager: ["@mozilla.org/gfx/screenmanager;1", "nsIScreenManager"], }); ChromeUtils.defineESModuleGetters(lazy, { diff --git a/browser/components/shell/ShellService.sys.mjs b/browser/components/shell/ShellService.sys.mjs @@ -16,14 +16,14 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "XreDirProvider", "@mozilla.org/xre/directory-provider;1", - Ci.nsIXREDirProvider + "nsIXREDirProvider" ); XPCOMUtils.defineLazyServiceGetter( lazy, "BackgroundTasks", "@mozilla.org/backgroundtasks;1", - Ci.nsIBackgroundTasks + "nsIBackgroundTasks" ); ChromeUtils.defineLazyGetter(lazy, "log", () => { @@ -604,28 +604,25 @@ let ShellServiceInternal = { let shellInterface; switch (AppConstants.platform) { case "win": - shellInterface = Ci.nsIWindowsShellService; + shellInterface = "nsIWindowsShellService"; break; case "macosx": - shellInterface = Ci.nsIMacShellService; + shellInterface = "nsIMacShellService"; break; case "linux": - shellInterface = Ci.nsIGNOMEShellService; + shellInterface = "nsIGNOMEShellService"; break; default: lazy.log.warn( `No platform native shell service interface for ${AppConstants.platform} queried, add for new platforms.` ); - shellInterface = Ci.nsIShellService; + shellInterface = "nsIShellService"; } XPCOMUtils.defineLazyServiceGetters(ShellServiceInternal, { - defaultAgent: ["@mozilla.org/default-agent;1", Ci.nsIDefaultAgent], + defaultAgent: ["@mozilla.org/default-agent;1", "nsIDefaultAgent"], shellService: ["@mozilla.org/browser/shell-service;1", shellInterface], - macDockSupport: [ - "@mozilla.org/widget/macdocksupport;1", - Ci.nsIMacDockSupport, - ], + macDockSupport: ["@mozilla.org/widget/macdocksupport;1", "nsIMacDockSupport"], }); /** diff --git a/browser/components/shell/StartupOSIntegration.sys.mjs b/browser/components/shell/StartupOSIntegration.sys.mjs @@ -15,10 +15,10 @@ const PREF_PRIVATE_BROWSING_SHORTCUT_CREATED = const lazy = {}; XPCOMUtils.defineLazyServiceGetters(lazy, { - BrowserHandler: ["@mozilla.org/browser/clh;1", Ci.nsIBrowserHandler], + BrowserHandler: ["@mozilla.org/browser/clh;1", "nsIBrowserHandler"], profileService: [ "@mozilla.org/toolkit/profile-service;1", - Ci.nsIToolkitProfileService, + "nsIToolkitProfileService", ], }); diff --git a/browser/components/shell/test/browser_setDefaultPDFHandler.js b/browser/components/shell/test/browser_setDefaultPDFHandler.js @@ -23,7 +23,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "XreDirProvider", "@mozilla.org/xre/directory-provider;1", - Ci.nsIXREDirProvider + "nsIXREDirProvider" ); const _userChoiceImpossibleTelemetryResultStub = sinon diff --git a/browser/components/taskbartabs/TaskbarTabsChrome.sys.mjs b/browser/components/taskbartabs/TaskbarTabsChrome.sys.mjs @@ -7,7 +7,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; let lazy = {}; XPCOMUtils.defineLazyServiceGetters(lazy, { - Favicons: ["@mozilla.org/browser/favicon-service;1", Ci.nsIFaviconService], + Favicons: ["@mozilla.org/browser/favicon-service;1", "nsIFaviconService"], }); // Set up Taskbar Tabs Window Chrome. diff --git a/browser/components/taskbartabs/TaskbarTabsUtils.sys.mjs b/browser/components/taskbartabs/TaskbarTabsUtils.sys.mjs @@ -8,8 +8,8 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; let lazy = {}; XPCOMUtils.defineLazyServiceGetters(lazy, { - Favicons: ["@mozilla.org/browser/favicon-service;1", Ci.nsIFaviconService], - imgTools: ["@mozilla.org/image/tools;1", Ci.imgITools], + Favicons: ["@mozilla.org/browser/favicon-service;1", "nsIFaviconService"], + imgTools: ["@mozilla.org/image/tools;1", "imgITools"], }); ChromeUtils.defineLazyGetter(lazy, "logConsole", () => { diff --git a/browser/components/taskbartabs/TaskbarTabsWindowManager.sys.mjs b/browser/components/taskbartabs/TaskbarTabsWindowManager.sys.mjs @@ -16,8 +16,8 @@ ChromeUtils.defineESModuleGetters(lazy, { }); XPCOMUtils.defineLazyServiceGetters(lazy, { - WindowsUIUtils: ["@mozilla.org/windows-ui-utils;1", Ci.nsIWindowsUIUtils], - WinTaskbar: ["@mozilla.org/windows-taskbar;1", Ci.nsIWinTaskbar], + WindowsUIUtils: ["@mozilla.org/windows-ui-utils;1", "nsIWindowsUIUtils"], + WinTaskbar: ["@mozilla.org/windows-taskbar;1", "nsIWinTaskbar"], }); ChromeUtils.defineLazyGetter(lazy, "logConsole", () => { diff --git a/browser/components/taskbartabs/test/browser/browser_taskbarTabs_chromeTest.js b/browser/components/taskbartabs/test/browser/browser_taskbarTabs_chromeTest.js @@ -3,7 +3,7 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ "use strict"; XPCOMUtils.defineLazyServiceGetters(this, { - Favicons: ["@mozilla.org/browser/favicon-service;1", Ci.nsIFaviconService], + Favicons: ["@mozilla.org/browser/favicon-service;1", "nsIFaviconService"], }); const gAudioPage = diff --git a/browser/components/taskbartabs/test/browser/browser_taskbarTabs_windowManager.js b/browser/components/taskbartabs/test/browser/browser_taskbarTabs_windowManager.js @@ -10,7 +10,7 @@ ChromeUtils.defineESModuleGetters(this, { }); XPCOMUtils.defineLazyServiceGetters(this, { - WinTaskbar: ["@mozilla.org/windows-taskbar;1", Ci.nsIWinTaskbar], + WinTaskbar: ["@mozilla.org/windows-taskbar;1", "nsIWinTaskbar"], }); const registry = new TaskbarTabsRegistry(); diff --git a/browser/components/taskbartabs/test/xpcshell/test_taskbarTabs_pin.js b/browser/components/taskbartabs/test/xpcshell/test_taskbarTabs_pin.js @@ -15,7 +15,7 @@ ChromeUtils.defineESModuleGetters(this, { }); XPCOMUtils.defineLazyServiceGetters(this, { - imgTools: ["@mozilla.org/image/tools;1", Ci.imgITools], + imgTools: ["@mozilla.org/image/tools;1", "imgITools"], }); // We want to mock the native XPCOM interfaces of the initialized diff --git a/browser/components/tests/browser/browser_browserGlue_upgradeDialog_trigger.js b/browser/components/tests/browser/browser_browserGlue_upgradeDialog_trigger.js @@ -14,7 +14,7 @@ const { OnboardingMessageProvider } = ChromeUtils.importESModule( ); XPCOMUtils.defineLazyServiceGetters(this, { - BrowserHandler: ["@mozilla.org/browser/clh;1", Ci.nsIBrowserHandler], + BrowserHandler: ["@mozilla.org/browser/clh;1", "nsIBrowserHandler"], }); add_setup(() => { diff --git a/browser/components/tests/browser/browser_contentpermissionprompt.js b/browser/components/tests/browser/browser_contentpermissionprompt.js @@ -10,7 +10,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "ContentPermissionPrompt", "@mozilla.org/content-permission/prompt;1", - Ci.nsIContentPermissionPrompt + "nsIContentPermissionPrompt" ); /** diff --git a/browser/components/touchbar/MacTouchBar.sys.mjs b/browser/components/touchbar/MacTouchBar.sys.mjs @@ -16,7 +16,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "touchBarUpdater", "@mozilla.org/widget/touchbarupdater;1", - Ci.nsITouchBarUpdater + "nsITouchBarUpdater" ); // For accessing TouchBarHelper methods from static contexts in this file. @@ -24,7 +24,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "touchBarHelper", "@mozilla.org/widget/touchbarhelper;1", - Ci.nsITouchBarHelper + "nsITouchBarHelper" ); /** diff --git a/browser/components/touchbar/tests/browser/browser_touchbar_searchrestrictions.js b/browser/components/touchbar/tests/browser/browser_touchbar_searchrestrictions.js @@ -20,7 +20,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "TouchBarHelper", "@mozilla.org/widget/touchbarhelper;1", - Ci.nsITouchBarHelper + "nsITouchBarHelper" ); /** diff --git a/browser/components/touchbar/tests/browser/browser_touchbar_tests.js b/browser/components/touchbar/tests/browser/browser_touchbar_tests.js @@ -6,14 +6,14 @@ XPCOMUtils.defineLazyServiceGetter( this, "TouchBarHelper", "@mozilla.org/widget/touchbarhelper;1", - Ci.nsITouchBarHelper + "nsITouchBarHelper" ); XPCOMUtils.defineLazyServiceGetter( this, "TouchBarInput", "@mozilla.org/widget/touchbarinput;1", - Ci.nsITouchBarInput + "nsITouchBarInput" ); const TEST_PATH = getRootDirectory(gTestPath).replace( diff --git a/browser/components/translations/content/selectTranslationsPanel.js b/browser/components/translations/content/selectTranslationsPanel.js @@ -21,14 +21,14 @@ XPCOMUtils.defineLazyServiceGetter( this, "ClipboardHelper", "@mozilla.org/widget/clipboardhelper;1", - Ci.nsIClipboardHelper + "nsIClipboardHelper" ); XPCOMUtils.defineLazyServiceGetter( this, "GfxInfo", "@mozilla.org/gfx/info;1", - Ci.nsIGfxInfo + "nsIGfxInfo" ); /** diff --git a/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs b/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs @@ -22,7 +22,7 @@ if (AppConstants.MOZ_UPDATER) { lazy, "AUS", "@mozilla.org/updates/update-service;1", - Ci.nsIApplicationUpdateService + "nsIApplicationUpdateService" ); } diff --git a/browser/components/urlbar/UrlbarProviderCalculator.sys.mjs b/browser/components/urlbar/UrlbarProviderCalculator.sys.mjs @@ -25,7 +25,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "ClipboardHelper", "@mozilla.org/widget/clipboardhelper;1", - Ci.nsIClipboardHelper + "nsIClipboardHelper" ); // This pref is relative to the `browser.urlbar` branch. diff --git a/browser/components/urlbar/UrlbarProviderUnitConversion.sys.mjs b/browser/components/urlbar/UrlbarProviderUnitConversion.sys.mjs @@ -28,7 +28,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "ClipboardHelper", "@mozilla.org/widget/clipboardhelper;1", - Ci.nsIClipboardHelper + "nsIClipboardHelper" ); const CONVERTERS = [ diff --git a/browser/components/urlbar/UrlbarUtils.sys.mjs b/browser/components/urlbar/UrlbarUtils.sys.mjs @@ -43,7 +43,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "parserUtils", "@mozilla.org/parserutils;1", - Ci.nsIParserUtils + "nsIParserUtils" ); export var UrlbarUtils = { diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs @@ -36,7 +36,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "styleSheetService", "@mozilla.org/content/style-sheet-service;1", - Ci.nsIStyleSheetService + "nsIStyleSheetService" ); // Query selector for selectable elements in results. diff --git a/browser/components/urlbar/private/SuggestBackendRust.sys.mjs b/browser/components/urlbar/private/SuggestBackendRust.sys.mjs @@ -44,7 +44,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "timerManager", "@mozilla.org/updates/timer-manager;1", - Ci.nsIUpdateTimerManager + "nsIUpdateTimerManager" ); const SUGGEST_DATA_STORE_BASENAME = "suggest.sqlite"; diff --git a/browser/components/urlbar/tests/browser-tips/browser_searchTips_interaction.js b/browser/components/urlbar/tests/browser-tips/browser_searchTips_interaction.js @@ -22,7 +22,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "clipboardHelper", "@mozilla.org/widget/clipboardhelper;1", - Ci.nsIClipboardHelper + "nsIClipboardHelper" ); // These should match the same consts in UrlbarProviderSearchTips.sys.mjs. diff --git a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_searchmode.js b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_searchmode.js @@ -27,7 +27,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "TouchBarHelper", "@mozilla.org/widget/touchbarhelper;1", - Ci.nsITouchBarHelper + "nsITouchBarHelper" ); /** diff --git a/browser/components/urlbar/tests/browser/head-common.js b/browser/components/urlbar/tests/browser/head-common.js @@ -27,7 +27,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "clipboardHelper", "@mozilla.org/widget/clipboardhelper;1", - Ci.nsIClipboardHelper + "nsIClipboardHelper" ); ChromeUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { diff --git a/browser/extensions/formautofill/api.js b/browser/extensions/formautofill/api.js @@ -19,7 +19,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "resProto", "@mozilla.org/network/protocol;1?name=resource", - Ci.nsISubstitutingProtocolHandler + "nsISubstitutingProtocolHandler" ); const RESOURCE_HOST = "formautofill"; diff --git a/browser/extensions/webcompat/about-compat/aboutPage.js b/browser/extensions/webcompat/about-compat/aboutPage.js @@ -10,7 +10,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "resProto", "@mozilla.org/network/protocol;1?name=resource", - Ci.nsISubstitutingProtocolHandler + "nsISubstitutingProtocolHandler" ); const ResourceSubstitution = "webcompat"; diff --git a/browser/modules/BrowserWindowTracker.sys.mjs b/browser/modules/BrowserWindowTracker.sys.mjs @@ -15,7 +15,7 @@ const lazy = {}; // Lazy getters XPCOMUtils.defineLazyServiceGetters(lazy, { - BrowserHandler: ["@mozilla.org/browser/clh;1", Ci.nsIBrowserHandler], + BrowserHandler: ["@mozilla.org/browser/clh;1", "nsIBrowserHandler"], }); ChromeUtils.defineESModuleGetters(lazy, { diff --git a/browser/modules/PermissionUI.sys.mjs b/browser/modules/PermissionUI.sys.mjs @@ -78,13 +78,13 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "IDNService", "@mozilla.org/network/idn-service;1", - Ci.nsIIDNService + "nsIIDNService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "ContentPrefService2", "@mozilla.org/content-pref/service;1", - Ci.nsIContentPrefService2 + "nsIContentPrefService2" ); ChromeUtils.defineLazyGetter(lazy, "gBrandBundle", function () { diff --git a/browser/modules/SharingUtils.sys.mjs b/browser/modules/SharingUtils.sys.mjs @@ -14,9 +14,9 @@ let lazy = {}; XPCOMUtils.defineLazyServiceGetters(lazy, { MacSharingService: [ "@mozilla.org/widget/macsharingservice;1", - Ci.nsIMacSharingService, + "nsIMacSharingService", ], - WindowsUIUtils: ["@mozilla.org/windows-ui-utils;1", Ci.nsIWindowsUIUtils], + WindowsUIUtils: ["@mozilla.org/windows-ui-utils;1", "nsIWindowsUIUtils"], }); class SharingUtilsCls { diff --git a/browser/modules/WebAuthnPromptHelper.sys.mjs b/browser/modules/WebAuthnPromptHelper.sys.mjs @@ -10,7 +10,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "webauthnService", "@mozilla.org/webauthn/service;1", - Ci.nsIWebAuthnService + "nsIWebAuthnService" ); export let WebAuthnPromptHelper = { diff --git a/browser/modules/WindowsJumpLists.sys.mjs b/browser/modules/WindowsJumpLists.sys.mjs @@ -50,13 +50,13 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "_idle", "@mozilla.org/widget/useridleservice;1", - Ci.nsIUserIdleService + "nsIUserIdleService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "_taskbarService", "@mozilla.org/windows-taskbar;1", - Ci.nsIWinTaskbar + "nsIWinTaskbar" ); ChromeUtils.defineESModuleGetters(lazy, { diff --git a/browser/modules/WindowsPreviewPerTab.sys.mjs b/browser/modules/WindowsPreviewPerTab.sys.mjs @@ -62,7 +62,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "imgTools", "@mozilla.org/image/tools;1", - Ci.imgITools + "imgITools" ); ChromeUtils.defineESModuleGetters(lazy, { PageThumbs: "resource://gre/modules/PageThumbs.sys.mjs", diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/api.js b/browser/tools/mozscreenshots/mozscreenshots/extension/api.js @@ -10,7 +10,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "resProto", "@mozilla.org/network/protocol;1?name=resource", - Ci.nsISubstitutingProtocolHandler + "nsISubstitutingProtocolHandler" ); this.mozscreenshots = class extends ExtensionAPI { diff --git a/devtools/client/framework/browser-toolbox/Launcher.sys.mjs b/devtools/client/framework/browser-toolbox/Launcher.sys.mjs @@ -30,7 +30,7 @@ ChromeUtils.defineESModuleGetters(lazy, { XPCOMUtils.defineLazyServiceGetters(lazy, { XreDirProvider: [ "@mozilla.org/xre/directory-provider;1", - Ci.nsIXREDirProvider, + "nsIXREDirProvider", ], }); diff --git a/devtools/client/storage/VariablesView.sys.mjs b/devtools/client/storage/VariablesView.sys.mjs @@ -42,7 +42,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "clipboardHelper", "@mozilla.org/widget/clipboardhelper;1", - Ci.nsIClipboardHelper + "nsIClipboardHelper" ); /** diff --git a/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_paste_undo.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_paste_undo.js @@ -10,7 +10,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "clipboardHelper", "@mozilla.org/widget/clipboardhelper;1", - Ci.nsIClipboardHelper + "nsIClipboardHelper" ); const stringToCopy = "foobazbarBug642615"; diff --git a/devtools/client/webconsole/test/browser/browser_jsterm_selfxss.js b/devtools/client/webconsole/test/browser/browser_jsterm_selfxss.js @@ -10,7 +10,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "clipboardHelper", "@mozilla.org/widget/clipboardhelper;1", - Ci.nsIClipboardHelper + "nsIClipboardHelper" ); const WebConsoleUtils = require("resource://devtools/client/webconsole/utils.js").Utils; diff --git a/devtools/server/actors/descriptors/worker.js b/devtools/server/actors/descriptors/worker.js @@ -41,7 +41,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "swm", "@mozilla.org/serviceworkers/manager;1", - Ci.nsIServiceWorkerManager + "nsIServiceWorkerManager" ); class WorkerDescriptorActor extends Actor { diff --git a/devtools/server/actors/worker/service-worker-registration-list.js b/devtools/server/actors/worker/service-worker-registration-list.js @@ -19,7 +19,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "swm", "@mozilla.org/serviceworkers/manager;1", - Ci.nsIServiceWorkerManager + "nsIServiceWorkerManager" ); class ServiceWorkerRegistrationActorList { diff --git a/devtools/server/actors/worker/service-worker-registration.js b/devtools/server/actors/worker/service-worker-registration.js @@ -24,14 +24,14 @@ XPCOMUtils.defineLazyServiceGetter( this, "swm", "@mozilla.org/serviceworkers/manager;1", - Ci.nsIServiceWorkerManager + "nsIServiceWorkerManager" ); XPCOMUtils.defineLazyServiceGetter( this, "PushService", "@mozilla.org/push/Service;1", - Ci.nsIPushService + "nsIPushService" ); class ServiceWorkerRegistrationActor extends Actor { diff --git a/devtools/server/actors/worker/worker-descriptor-actor-list.js b/devtools/server/actors/worker/worker-descriptor-actor-list.js @@ -19,7 +19,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "wdm", "@mozilla.org/dom/workers/workerdebuggermanager;1", - Ci.nsIWorkerDebuggerManager + "nsIWorkerDebuggerManager" ); function matchWorkerDebugger(dbg, options) { diff --git a/devtools/server/connectors/js-process-actor/target-watchers/service_worker.sys.mjs b/devtools/server/connectors/js-process-actor/target-watchers/service_worker.sys.mjs @@ -10,7 +10,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "wdm", "@mozilla.org/dom/workers/workerdebuggermanager;1", - Ci.nsIWorkerDebuggerManager + "nsIWorkerDebuggerManager" ); class ServiceWorkerTargetWatcherClass extends WorkerTargetWatcherClass { diff --git a/devtools/server/connectors/js-process-actor/target-watchers/worker.sys.mjs b/devtools/server/connectors/js-process-actor/target-watchers/worker.sys.mjs @@ -10,7 +10,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "wdm", "@mozilla.org/dom/workers/workerdebuggermanager;1", - Ci.nsIWorkerDebuggerManager + "nsIWorkerDebuggerManager" ); const { TYPE_DEDICATED, TYPE_SERVICE, TYPE_SHARED } = Ci.nsIWorkerDebugger; diff --git a/devtools/shared/loader/base-loader.sys.mjs b/devtools/shared/loader/base-loader.sys.mjs @@ -17,7 +17,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "resProto", "@mozilla.org/network/protocol;1?name=resource", - Ci.nsIResProtocolHandler + "nsIResProtocolHandler" ); ChromeUtils.defineESModuleGetters( diff --git a/devtools/shared/network-observer/NetworkOverride.sys.mjs b/devtools/shared/network-observer/NetworkOverride.sys.mjs @@ -20,7 +20,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "mimeService", "@mozilla.org/mime;1", - Ci.nsIMIMEService + "nsIMIMEService" ); function readFile(file) { diff --git a/devtools/shared/network-observer/NetworkThrottleManager.sys.mjs b/devtools/shared/network-observer/NetworkThrottleManager.sys.mjs @@ -20,7 +20,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gActivityDistributor", "@mozilla.org/network/http-activity-distributor;1", - Ci.nsIHttpActivityDistributor + "nsIHttpActivityDistributor" ); ChromeUtils.defineESModuleGetters(lazy, { diff --git a/docshell/base/URIFixup.sys.mjs b/docshell/base/URIFixup.sys.mjs @@ -26,21 +26,21 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "externalProtocolService", "@mozilla.org/uriloader/external-protocol-service;1", - Ci.nsIExternalProtocolService + "nsIExternalProtocolService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "defaultProtocolHandler", "@mozilla.org/network/protocol;1?name=default", - Ci.nsIProtocolHandler + "nsIProtocolHandler" ); XPCOMUtils.defineLazyServiceGetter( lazy, "fileProtocolHandler", "@mozilla.org/network/protocol;1?name=file", - Ci.nsIFileProtocolHandler + "nsIFileProtocolHandler" ); XPCOMUtils.defineLazyPreferenceGetter( diff --git a/docshell/test/unit/test_URIFixup_check_host.js b/docshell/test/unit/test_URIFixup_check_host.js @@ -11,7 +11,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gDNSOverride", "@mozilla.org/network/native-dns-override;1", - Ci.nsINativeDNSResolverOverride + "nsINativeDNSResolverOverride" ); add_task(async function setup() { diff --git a/dom/credentialmanagement/identity/tests/browser/browser_autoreauthn_doesnt_show_ui.js b/dom/credentialmanagement/identity/tests/browser/browser_autoreauthn_doesnt_show_ui.js @@ -8,7 +8,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "IdentityCredentialStorageService", "@mozilla.org/browser/identity-credential-storage-service;1", - Ci.nsIIdentityCredentialStorageService + "nsIIdentityCredentialStorageService" ); const TEST_URL = "https://example.com/"; diff --git a/dom/credentialmanagement/identity/tests/browser/browser_disconnect.js b/dom/credentialmanagement/identity/tests/browser/browser_disconnect.js @@ -8,7 +8,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "IdentityCredentialStorageService", "@mozilla.org/browser/identity-credential-storage-service;1", - Ci.nsIIdentityCredentialStorageService + "nsIIdentityCredentialStorageService" ); const TEST_URL = "https://example.com/"; diff --git a/dom/credentialmanagement/identity/tests/browser/browser_loginStatus.js b/dom/credentialmanagement/identity/tests/browser/browser_loginStatus.js @@ -8,7 +8,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "IdentityCredentialStorageService", "@mozilla.org/browser/identity-credential-storage-service;1", - Ci.nsIIdentityCredentialStorageService + "nsIIdentityCredentialStorageService" ); const TEST_URL = "https://example.com/"; diff --git a/dom/credentialmanagement/identity/tests/browser/browser_passive_requires_connected.js b/dom/credentialmanagement/identity/tests/browser/browser_passive_requires_connected.js @@ -8,7 +8,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "IdentityCredentialStorageService", "@mozilla.org/browser/identity-credential-storage-service;1", - Ci.nsIIdentityCredentialStorageService + "nsIIdentityCredentialStorageService" ); const TEST_URL = "https://example.com/"; diff --git a/dom/push/Push.sys.mjs b/dom/push/Push.sys.mjs @@ -17,7 +17,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "PushService", "@mozilla.org/push/Service;1", - Ci.nsIPushService + "nsIPushService" ); /** diff --git a/dom/push/PushComponents.sys.mjs b/dom/push/PushComponents.sys.mjs @@ -122,7 +122,7 @@ XPCOMUtils.defineLazyServiceGetter( PushServiceParent.prototype, "_mm", "@mozilla.org/parentprocessmessagemanager;1", - Ci.nsISupports + "nsISupports" ); Object.assign(PushServiceParent.prototype, { @@ -363,7 +363,7 @@ XPCOMUtils.defineLazyServiceGetter( PushServiceContent.prototype, "_mm", "@mozilla.org/childprocessmessagemanager;1", - Ci.nsISupports + "nsISupports" ); Object.assign(PushServiceContent.prototype, { diff --git a/dom/push/PushService.sys.mjs b/dom/push/PushService.sys.mjs @@ -12,7 +12,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gPushNotifier", "@mozilla.org/push/Notifier;1", - Ci.nsIPushNotifier + "nsIPushNotifier" ); ChromeUtils.defineESModuleGetters(lazy, { PushCrypto: "resource://gre/modules/PushCrypto.sys.mjs", diff --git a/dom/push/test/xpcshell/head.js b/dom/push/test/xpcshell/head.js @@ -32,7 +32,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "PushServiceComponent", "@mozilla.org/push/Service;1", - Ci.nsIPushService + "nsIPushService" ); const servicePrefs = new Preferences("dom.push."); diff --git a/dom/security/test/https-first/browser_schemeless.js b/dom/security/test/https-first/browser_schemeless.js @@ -18,7 +18,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "clipboardHelper", "@mozilla.org/widget/clipboardhelper;1", - Ci.nsIClipboardHelper + "nsIClipboardHelper" ); /** Type aInput into the address bar and press enter */ diff --git a/extensions/spellcheck/hunspell/tests/unit/test_hunspell_unicode_paths.js b/extensions/spellcheck/hunspell/tests/unit/test_hunspell_unicode_paths.js @@ -8,7 +8,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "spellCheck", "@mozilla.org/spellchecker/engine;1", - Ci.mozISpellCheckingEngine + "mozISpellCheckingEngine" ); const nsFile = Components.Constructor( diff --git a/js/xpconnect/loader/XPCOMUtils.sys.mjs b/js/xpconnect/loader/XPCOMUtils.sys.mjs @@ -119,37 +119,45 @@ export var XPCOMUtils = { * The name of the getter to define on aObject for the service. * @param {string} aContract * The contract used to obtain the service. - * @param {nsIID} aInterface + * @param {nsID|string} aInterface * The interface or name of interface to query the service to. */ defineLazyServiceGetter(aObject, aName, aContract, aInterface) { ChromeUtils.defineLazyGetter(aObject, aName, () => { - return Cc[aContract].getService(aInterface); + if (aInterface) { + if (typeof aInterface === "string") { + aInterface = Ci[aInterface]; + } + return Cc[aContract].getService(aInterface); + } + return Cc[aContract].getService().wrappedJSObject; }); }, /** - * @typedef {[string, nsIID]} aServicesDetail - * Details of the service, the first item in the array is the contract - * ID, the second is the nsIID for the interface of the service. - */ - - /** * Defines a lazy service getter on a specified object for each * property in the given object. * * @param {object} aObject * The object to define the lazy getter on. - * @param {{[key: string]: aServicesDetail}} aServices + * @param {object} aServices * An object with a property for each service to be - * imported. + * imported, where the property name is the name of the + * symbol to define, and the value is a 1 or 2 element array + * containing the contract ID and, optionally, the interface + * name of the service, as passed to defineLazyServiceGetter. */ defineLazyServiceGetters(aObject, aServices) { for (let [name, service] of Object.entries(aServices)) { // Note: This is hot code, and cross-compartment array wrappers // are not JIT-friendly to destructuring or spread operators, so // we need to use indexed access instead. - this.defineLazyServiceGetter(aObject, name, service[0], service[1]); + this.defineLazyServiceGetter( + aObject, + name, + service[0], + service[1] || null + ); } }, diff --git a/js/xpconnect/tests/unit/test_xpcomutils.js b/js/xpconnect/tests/unit/test_xpcomutils.js @@ -48,7 +48,7 @@ add_test(function test_defineLazyServiceGetter() let obj = { }; XPCOMUtils.defineLazyServiceGetter(obj, "service", "@mozilla.org/consoleservice;1", - Ci.nsIConsoleService); + "nsIConsoleService"); let service = Cc["@mozilla.org/consoleservice;1"]. getService(Ci.nsIConsoleService); diff --git a/mobile/shared/actors/GeckoViewPermissionProcessChild.sys.mjs b/mobile/shared/actors/GeckoViewPermissionProcessChild.sys.mjs @@ -11,7 +11,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "MediaManagerService", "@mozilla.org/mediaManagerService;1", - Ci.nsIMediaManagerService + "nsIMediaManagerService" ); const STATUS_RECORDING = "recording"; diff --git a/mobile/shared/modules/geckoview/GeckoViewProgress.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewProgress.sys.mjs @@ -11,14 +11,14 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "OverrideService", "@mozilla.org/security/certoverride;1", - Ci.nsICertOverrideService + "nsICertOverrideService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "IDNService", "@mozilla.org/network/idn-service;1", - Ci.nsIIDNService + "nsIIDNService" ); ChromeUtils.defineESModuleGetters(lazy, { diff --git a/mobile/shared/modules/geckoview/GeckoViewPushController.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewPushController.sys.mjs @@ -11,7 +11,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "PushNotifier", "@mozilla.org/push/Notifier;1", - Ci.nsIPushNotifier + "nsIPushNotifier" ); const { debug, warn } = GeckoViewUtils.initLogging("GeckoViewPushController"); diff --git a/netwerk/test/unit/test_bug1177909.js b/netwerk/test/unit/test_bug1177909.js @@ -8,7 +8,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "gProxyService", "@mozilla.org/network/protocol-proxy-service;1", - Ci.nsIProtocolProxyService + "nsIProtocolProxyService" ); ChromeUtils.defineLazyGetter(this, "systemSettings", function () { diff --git a/netwerk/test/unit/test_pac_reload_after_network_change.js b/netwerk/test/unit/test_pac_reload_after_network_change.js @@ -7,7 +7,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "gProxyService", "@mozilla.org/network/protocol-proxy-service;1", - Ci.nsIProtocolProxyService + "nsIProtocolProxyService" ); var { setTimeout } = ChromeUtils.importESModule( "resource://gre/modules/Timer.sys.mjs" diff --git a/remote/marionette/stream-utils.sys.mjs b/remote/marionette/stream-utils.sys.mjs @@ -14,7 +14,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "IOUtil", "@mozilla.org/io-util;1", - Ci.nsIIOUtil + "nsIIOUtil" ); ChromeUtils.defineLazyGetter(lazy, "ScriptableInputStream", () => { diff --git a/remote/marionette/webauthn.sys.mjs b/remote/marionette/webauthn.sys.mjs @@ -10,7 +10,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "webauthnService", "@mozilla.org/webauthn/service;1", - Ci.nsIWebAuthnService + "nsIWebAuthnService" ); /** @namespace */ diff --git a/remote/shared/webdriver/Certificates.sys.mjs b/remote/shared/webdriver/Certificates.sys.mjs @@ -10,14 +10,14 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "sss", "@mozilla.org/ssservice;1", - Ci.nsISiteSecurityService + "nsISiteSecurityService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "certOverrideService", "@mozilla.org/security/certoverride;1", - Ci.nsICertOverrideService + "nsICertOverrideService" ); const CERT_PINNING_ENFORCEMENT_PREF = "security.cert_pinning.enforcement_level"; diff --git a/remote/shared/webdriver/Session.sys.mjs b/remote/shared/webdriver/Session.sys.mjs @@ -38,7 +38,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "aomStartup", "@mozilla.org/addons/addon-manager-startup;1", - Ci.amIAddonManagerStartup + "amIAddonManagerStartup" ); // Global singleton that holds active WebDriver sessions diff --git a/remote/webdriver-bidi/ProxyPerUserContextManager.sys.mjs b/remote/webdriver-bidi/ProxyPerUserContextManager.sys.mjs @@ -14,7 +14,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "protocolProxyService", "@mozilla.org/network/protocol-proxy-service;1", - Ci.nsIProtocolProxyService + "nsIProtocolProxyService" ); const nsIProtocolProxyChannelFilter = ChromeUtils.generateQI([ diff --git a/services/fxaccounts/FxAccountsCommands.sys.mjs b/services/fxaccounts/FxAccountsCommands.sys.mjs @@ -47,7 +47,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "idleService", "@mozilla.org/widget/useridleservice;1", - Ci.nsIUserIdleService + "nsIUserIdleService" ); const TOPIC_TABS_CHANGED = "services.sync.tabs.changed"; diff --git a/services/fxaccounts/tests/xpcshell/test_push_service.js b/services/fxaccounts/tests/xpcshell/test_push_service.js @@ -31,7 +31,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "PushService", "@mozilla.org/push/Service;1", - Ci.nsIPushService + "nsIPushService" ); initTestLogging("Trace"); diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs @@ -16,13 +16,13 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "CaptivePortalService", "@mozilla.org/network/captive-portal-service;1", - Ci.nsICaptivePortalService + "nsICaptivePortalService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "gNetworkLinkService", "@mozilla.org/network/network-link-service;1", - Ci.nsINetworkLinkService + "nsINetworkLinkService" ); // Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref. diff --git a/services/sync/modules/policies.sys.mjs b/services/sync/modules/policies.sys.mjs @@ -56,13 +56,13 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "IdleService", "@mozilla.org/widget/useridleservice;1", - Ci.nsIUserIdleService + "nsIUserIdleService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "CaptivePortalService", "@mozilla.org/network/captive-portal-service;1", - Ci.nsICaptivePortalService + "nsICaptivePortalService" ); // Get the value for an interval that's stored in preferences. To save users diff --git a/services/sync/modules/util.sys.mjs b/services/sync/modules/util.sys.mjs @@ -25,7 +25,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "cryptoSDR", "@mozilla.org/login-manager/crypto/SDR;1", - Ci.nsILoginManagerCrypto + "nsILoginManagerCrypto" ); XPCOMUtils.defineLazyPreferenceGetter( diff --git a/services/sync/tests/unit/test_history_engine.js b/services/sync/tests/unit/test_history_engine.js @@ -13,7 +13,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "asyncHistory", "@mozilla.org/browser/history;1", - Ci.mozIAsyncHistory + "mozIAsyncHistory" ); async function rawAddVisit(id, uri, visitPRTime, transitionType) { return new Promise(resolve => { diff --git a/services/sync/tps/extensions/tps/api.js b/services/sync/tps/extensions/tps/api.js @@ -12,7 +12,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "resProto", "@mozilla.org/network/protocol;1?name=resource", - Ci.nsISubstitutingProtocolHandler + "nsISubstitutingProtocolHandler" ); async function tpsStartup() { diff --git a/testing/mochitest/BrowserTestUtils/BrowserTestUtils.sys.mjs b/testing/mochitest/BrowserTestUtils/BrowserTestUtils.sys.mjs @@ -26,7 +26,7 @@ ChromeUtils.defineESModuleGetters(lazy, { XPCOMUtils.defineLazyServiceGetters(lazy, { ProtocolProxyService: [ "@mozilla.org/network/protocol-proxy-service;1", - Ci.nsIProtocolProxyService, + "nsIProtocolProxyService", ], }); diff --git a/testing/modules/XPCShellContentUtils.sys.mjs b/testing/modules/XPCShellContentUtils.sys.mjs @@ -31,7 +31,7 @@ ChromeUtils.defineESModuleGetters(lazy, { XPCOMUtils.defineLazyServiceGetters(lazy, { proxyService: [ "@mozilla.org/network/protocol-proxy-service;1", - Ci.nsIProtocolProxyService, + "nsIProtocolProxyService", ], }); diff --git a/testing/specialpowers/api.js b/testing/specialpowers/api.js @@ -12,7 +12,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "resProto", "@mozilla.org/network/protocol;1?name=resource", - Ci.nsISubstitutingProtocolHandler + "nsISubstitutingProtocolHandler" ); this.specialpowers = class extends ExtensionAPI { diff --git a/testing/talos/talos/pageloader/api.js b/testing/talos/talos/pageloader/api.js @@ -46,7 +46,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "aomStartup", "@mozilla.org/addons/addon-manager-startup;1", - Ci.amIAddonManagerStartup + "amIAddonManagerStartup" ); async function talosStart() { diff --git a/testing/talos/talos/talos-powers/api.js b/testing/talos/talos/talos-powers/api.js @@ -22,7 +22,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "resProto", "@mozilla.org/network/protocol;1?name=resource", - Ci.nsISubstitutingProtocolHandler + "nsISubstitutingProtocolHandler" ); // These are not automagically defined for us because we are an extension. diff --git a/testing/talos/talos/tests/tart/addon/api.js b/testing/talos/talos/tests/tart/addon/api.js @@ -6,14 +6,14 @@ XPCOMUtils.defineLazyServiceGetter( this, "aomStartup", "@mozilla.org/addons/addon-manager-startup;1", - Ci.amIAddonManagerStartup + "amIAddonManagerStartup" ); XPCOMUtils.defineLazyServiceGetter( this, "clipboardHelper", "@mozilla.org/widget/clipboardhelper;1", - Ci.nsIClipboardHelper + "nsIClipboardHelper" ); /* globals ExtensionAPI */ diff --git a/toolkit/actors/UserCharacteristicsParent.sys.mjs b/toolkit/actors/UserCharacteristicsParent.sys.mjs @@ -17,7 +17,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "UserCharacteristicsPageService", "@mozilla.org/user-characteristics-page;1", - Ci.nsIUserCharacteristicsPageService + "nsIUserCharacteristicsPageService" ); function mapToObjectReplacer(_key, value) { diff --git a/toolkit/components/antitracking/PurgeTrackerService.sys.mjs b/toolkit/components/antitracking/PurgeTrackerService.sys.mjs @@ -12,13 +12,13 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gClassifier", "@mozilla.org/url-classifier/dbservice;1", - Ci.nsIURIClassifier + "nsIURIClassifier" ); XPCOMUtils.defineLazyServiceGetter( lazy, "gStorageActivityService", "@mozilla.org/storage/activity-service;1", - Ci.nsIStorageActivityService + "nsIStorageActivityService" ); ChromeUtils.defineLazyGetter(lazy, "gClassifierFeature", () => { diff --git a/toolkit/components/antitracking/test/browser/browser_storageAccessWithDynamicFpi.js b/toolkit/components/antitracking/test/browser/browser_storageAccessWithDynamicFpi.js @@ -11,7 +11,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "peuService", "@mozilla.org/partitioning/exception-list-service;1", - Ci.nsIPartitioningExceptionListService + "nsIPartitioningExceptionListService" ); const TEST_REDIRECT_TOP_PAGE = diff --git a/toolkit/components/antitracking/test/browser/browser_urlQueryStrippingListService.js b/toolkit/components/antitracking/test/browser/browser_urlQueryStrippingListService.js @@ -9,7 +9,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "urlQueryStrippingListService", "@mozilla.org/query-stripping-list-service;1", - Ci.nsIURLQueryStrippingListService + "nsIURLQueryStrippingListService" ); const COLLECTION_NAME = "query-stripping"; diff --git a/toolkit/components/antitracking/test/xpcshell/test_purge_trackers.js b/toolkit/components/antitracking/test/xpcshell/test_purge_trackers.js @@ -29,7 +29,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "PurgeTrackerService", "@mozilla.org/purge-tracker-service;1", - Ci.nsIPurgeTrackerService + "nsIPurgeTrackerService" ); async function setupTest(aCookieBehavior) { diff --git a/toolkit/components/antitracking/test/xpcshell/test_purge_trackers_telemetry.js b/toolkit/components/antitracking/test/xpcshell/test_purge_trackers_telemetry.js @@ -21,7 +21,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "PurgeTrackerService", "@mozilla.org/purge-tracker-service;1", - Ci.nsIPurgeTrackerService + "nsIPurgeTrackerService" ); add_task(async function setup() { diff --git a/toolkit/components/antitracking/test/xpcshell/test_tracking_db_service.js b/toolkit/components/antitracking/test/xpcshell/test_tracking_db_service.js @@ -13,7 +13,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "TrackingDBService", "@mozilla.org/tracking-db-service;1", - Ci.nsITrackingDBService + "nsITrackingDBService" ); ChromeUtils.defineLazyGetter(this, "DB_PATH", function () { diff --git a/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs b/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs @@ -44,7 +44,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gDebug", "@mozilla.org/xpcom/debug;1", - Ci.nsIDebug2 + "nsIDebug2" ); // `true` if this is a content process, `false` otherwise. diff --git a/toolkit/components/backgroundtasks/BackgroundTask_removeProfileFiles.sys.mjs b/toolkit/components/backgroundtasks/BackgroundTask_removeProfileFiles.sys.mjs @@ -11,7 +11,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "ProfileService", "@mozilla.org/toolkit/profile-service;1", - Ci.nsIToolkitProfileService + "nsIToolkitProfileService" ); // Usage: diff --git a/toolkit/components/backgroundtasks/BackgroundTasksUtils.sys.mjs b/toolkit/components/backgroundtasks/BackgroundTasksUtils.sys.mjs @@ -25,7 +25,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "ProfileService", "@mozilla.org/toolkit/profile-service;1", - Ci.nsIToolkitProfileService + "nsIToolkitProfileService" ); ChromeUtils.defineESModuleGetters(lazy, { diff --git a/toolkit/components/bitsdownload/Bits.sys.mjs b/toolkit/components/bitsdownload/Bits.sys.mjs @@ -28,7 +28,7 @@ if (AppConstants.MOZ_BITS_DOWNLOAD) { lazy, "gBits", "@mozilla.org/bits;1", - Ci.nsIBits + "nsIBits" ); } diff --git a/toolkit/components/captivedetect/test/unit/head_setprefs.js b/toolkit/components/captivedetect/test/unit/head_setprefs.js @@ -39,7 +39,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "gCaptivePortalDetector", "@mozilla.org/toolkit/captive-detector;1", - Ci.nsICaptivePortalDetector + "nsICaptivePortalDetector" ); const kCanonicalSitePath = "/canonicalSite.html"; diff --git a/toolkit/components/cleardata/ClearDataService.sys.mjs b/toolkit/components/cleardata/ClearDataService.sys.mjs @@ -18,25 +18,25 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "sas", "@mozilla.org/storage/activity-service;1", - Ci.nsIStorageActivityService + "nsIStorageActivityService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "TrackingDBService", "@mozilla.org/tracking-db-service;1", - Ci.nsITrackingDBService + "nsITrackingDBService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "IdentityCredentialStorageService", "@mozilla.org/browser/identity-credential-storage-service;1", - Ci.nsIIdentityCredentialStorageService + "nsIIdentityCredentialStorageService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "bounceTrackingProtection", "@mozilla.org/bounce-tracking-protection;1", - Ci.nsIBounceTrackingProtection + "nsIBounceTrackingProtection" ); XPCOMUtils.defineLazyPreferenceGetter( diff --git a/toolkit/components/cleardata/PrincipalsCollector.sys.mjs b/toolkit/components/cleardata/PrincipalsCollector.sys.mjs @@ -10,7 +10,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "serviceWorkerManager", "@mozilla.org/serviceworkers/manager;1", - Ci.nsIServiceWorkerManager + "nsIServiceWorkerManager" ); let logConsole; diff --git a/toolkit/components/cleardata/ServiceWorkerCleanUp.sys.mjs b/toolkit/components/cleardata/ServiceWorkerCleanUp.sys.mjs @@ -10,7 +10,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "serviceWorkerManager", "@mozilla.org/serviceworkers/manager;1", - Ci.nsIServiceWorkerManager + "nsIServiceWorkerManager" ); if (Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_CONTENT) { diff --git a/toolkit/components/cleardata/SiteDataTestUtils.sys.mjs b/toolkit/components/cleardata/SiteDataTestUtils.sys.mjs @@ -12,7 +12,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "swm", "@mozilla.org/serviceworkers/manager;1", - Ci.nsIServiceWorkerManager + "nsIServiceWorkerManager" ); /** diff --git a/toolkit/components/cleardata/tests/unit/test_bounce_tracking_protection.js b/toolkit/components/cleardata/tests/unit/test_bounce_tracking_protection.js @@ -11,7 +11,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "bounceTrackingProtection", "@mozilla.org/bounce-tracking-protection;1", - Ci.nsIBounceTrackingProtection + "nsIBounceTrackingProtection" ); const { CLEAR_BOUNCE_TRACKING_PROTECTION_STATE } = Ci.nsIClearDataService; diff --git a/toolkit/components/cleardata/tests/unit/test_identity_credential_storage.js b/toolkit/components/cleardata/tests/unit/test_identity_credential_storage.js @@ -11,7 +11,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "IdentityCredentialStorageService", "@mozilla.org/browser/identity-credential-storage-service;1", - Ci.nsIIdentityCredentialStorageService + "nsIIdentityCredentialStorageService" ); do_get_profile(); diff --git a/toolkit/components/contentprefs/ContentPrefServiceParent.sys.mjs b/toolkit/components/contentprefs/ContentPrefServiceParent.sys.mjs @@ -157,5 +157,5 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "cps2", "@mozilla.org/content-pref/service;1", - Ci.nsIContentPrefService2 + "nsIContentPrefService2" ); diff --git a/toolkit/components/contentrelevancy/ContentRelevancyManager.sys.mjs b/toolkit/components/contentrelevancy/ContentRelevancyManager.sys.mjs @@ -27,7 +27,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "timerManager", "@mozilla.org/updates/timer-manager;1", - Ci.nsIUpdateTimerManager + "nsIUpdateTimerManager" ); // Constants used by `nsIUpdateTimerManager` for a cross-session timer. diff --git a/toolkit/components/credentialmanagement/IdentityCredentialPromptService.sys.mjs b/toolkit/components/credentialmanagement/IdentityCredentialPromptService.sys.mjs @@ -13,7 +13,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "IDNService", "@mozilla.org/network/idn-service;1", - Ci.nsIIDNService + "nsIIDNService" ); XPCOMUtils.defineLazyPreferenceGetter( diff --git a/toolkit/components/credentialmanagement/tests/browser/browser_account_dialog.js b/toolkit/components/credentialmanagement/tests/browser/browser_account_dialog.js @@ -8,7 +8,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "IdentityCredentialPromptService", "@mozilla.org/browser/identitycredentialpromptservice;1", - Ci.nsIIdentityCredentialPromptService + "nsIIdentityCredentialPromptService" ); const TEST_URL = "https://example.com/"; diff --git a/toolkit/components/credentialmanagement/tests/browser/browser_provider_dialog.js b/toolkit/components/credentialmanagement/tests/browser/browser_provider_dialog.js @@ -8,7 +8,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "IdentityCredentialPromptService", "@mozilla.org/browser/identitycredentialpromptservice;1", - Ci.nsIIdentityCredentialPromptService + "nsIIdentityCredentialPromptService" ); const TEST_URL = "https://example.com/"; diff --git a/toolkit/components/credentialmanagement/tests/xpcshell/test_identity_credential_storage_service.js b/toolkit/components/credentialmanagement/tests/xpcshell/test_identity_credential_storage_service.js @@ -6,7 +6,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "IdentityCredentialStorageService", "@mozilla.org/browser/identity-credential-storage-service;1", - Ci.nsIIdentityCredentialStorageService + "nsIIdentityCredentialStorageService" ); do_get_profile(); diff --git a/toolkit/components/doh/DoHController.sys.mjs b/toolkit/components/doh/DoHController.sys.mjs @@ -69,14 +69,14 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gCaptivePortalService", "@mozilla.org/network/captive-portal-service;1", - Ci.nsICaptivePortalService + "nsICaptivePortalService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "gNetworkLinkService", "@mozilla.org/network/network-link-service;1", - Ci.nsINetworkLinkService + "nsINetworkLinkService" ); // Stores whether we've done first-run. diff --git a/toolkit/components/doh/DoHHeuristics.sys.mjs b/toolkit/components/doh/DoHHeuristics.sys.mjs @@ -15,14 +15,14 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gNetworkLinkService", "@mozilla.org/network/network-link-service;1", - Ci.nsINetworkLinkService + "nsINetworkLinkService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "gParentalControlsService", "@mozilla.org/parental-controls-service;1", - Ci.nsIParentalControlsService + "nsIParentalControlsService" ); ChromeUtils.defineESModuleGetters(lazy, { diff --git a/toolkit/components/doh/TRRPerformance.sys.mjs b/toolkit/components/doh/TRRPerformance.sys.mjs @@ -23,14 +23,14 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gNetworkLinkService", "@mozilla.org/network/network-link-service;1", - Ci.nsINetworkLinkService + "nsINetworkLinkService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "gCaptivePortalService", "@mozilla.org/network/captive-portal-service;1", - Ci.nsICaptivePortalService + "nsICaptivePortalService" ); // The canonical domain whose subdomains we will be resolving. diff --git a/toolkit/components/doh/test/browser/head.js b/toolkit/components/doh/test/browser/head.js @@ -17,7 +17,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "gDNSOverride", "@mozilla.org/network/native-dns-override;1", - Ci.nsINativeDNSResolverOverride + "nsINativeDNSResolverOverride" ); const { CommonUtils } = ChromeUtils.importESModule( diff --git a/toolkit/components/downloads/DownloadIntegration.sys.mjs b/toolkit/components/downloads/DownloadIntegration.sys.mjs @@ -32,19 +32,19 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gDownloadPlatform", "@mozilla.org/toolkit/download-platform;1", - Ci.mozIDownloadPlatform + "mozIDownloadPlatform" ); XPCOMUtils.defineLazyServiceGetter( lazy, "gMIMEService", "@mozilla.org/mime;1", - Ci.nsIMIMEService + "nsIMIMEService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "gExternalProtocolService", "@mozilla.org/uriloader/external-protocol-service;1", - Ci.nsIExternalProtocolService + "nsIExternalProtocolService" ); ChromeUtils.defineLazyGetter(lazy, "gParentalControlsService", function () { diff --git a/toolkit/components/downloads/test/unit/head.js b/toolkit/components/downloads/test/unit/head.js @@ -62,7 +62,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "gMIMEService", "@mozilla.org/mime;1", - Ci.nsIMIMEService + "nsIMIMEService" ); const ReferrerInfo = Components.Constructor( diff --git a/toolkit/components/extensions/parent/ext-captivePortal.js b/toolkit/components/extensions/parent/ext-captivePortal.js @@ -9,7 +9,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "gCPS", "@mozilla.org/network/captive-portal-service;1", - Ci.nsICaptivePortalService + "nsICaptivePortalService" ); XPCOMUtils.defineLazyPreferenceGetter( diff --git a/toolkit/components/extensions/parent/ext-clipboard.js b/toolkit/components/extensions/parent/ext-clipboard.js @@ -10,7 +10,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "imgTools", "@mozilla.org/image/tools;1", - Ci.imgITools + "imgITools" ); const Transferable = Components.Constructor( diff --git a/toolkit/components/extensions/parent/ext-idle.js b/toolkit/components/extensions/parent/ext-idle.js @@ -8,7 +8,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "idleService", "@mozilla.org/widget/useridleservice;1", - Ci.nsIUserIdleService + "nsIUserIdleService" ); var { DefaultWeakMap } = ExtensionUtils; diff --git a/toolkit/components/extensions/parent/ext-management.js b/toolkit/components/extensions/parent/ext-management.js @@ -23,7 +23,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "promptService", "@mozilla.org/prompter;1", - Ci.nsIPromptService + "nsIPromptService" ); var { ExtensionError } = ExtensionUtils; diff --git a/toolkit/components/extensions/parent/ext-networkStatus.js b/toolkit/components/extensions/parent/ext-networkStatus.js @@ -9,7 +9,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "gNetworkLinkService", "@mozilla.org/network/network-link-service;1", - Ci.nsINetworkLinkService + "nsINetworkLinkService" ); function getLinkType() { diff --git a/toolkit/components/extensions/parent/ext-protocolHandlers.js b/toolkit/components/extensions/parent/ext-protocolHandlers.js @@ -10,13 +10,13 @@ XPCOMUtils.defineLazyServiceGetter( this, "handlerService", "@mozilla.org/uriloader/handler-service;1", - Ci.nsIHandlerService + "nsIHandlerService" ); XPCOMUtils.defineLazyServiceGetter( this, "protocolService", "@mozilla.org/uriloader/external-protocol-service;1", - Ci.nsIExternalProtocolService + "nsIExternalProtocolService" ); const hasHandlerApp = handlerConfig => { diff --git a/toolkit/components/extensions/test/xpcshell/data/TestWorkerWatcherChild.sys.mjs b/toolkit/components/extensions/test/xpcshell/data/TestWorkerWatcherChild.sys.mjs @@ -6,7 +6,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "wdm", "@mozilla.org/dom/workers/workerdebuggermanager;1", - Ci.nsIWorkerDebuggerManager + "nsIWorkerDebuggerManager" ); export class TestWorkerWatcherChild extends JSProcessActorChild { diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_dnr_startup_cache.js b/toolkit/components/extensions/test/xpcshell/test_ext_dnr_startup_cache.js @@ -16,7 +16,7 @@ ChromeUtils.defineESModuleGetters(this, { XPCOMUtils.defineLazyServiceGetters(this, { aomStartup: [ "@mozilla.org/addons/addon-manager-startup;1", - Ci.amIAddonManagerStartup, + "amIAddonManagerStartup", ], }); diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_proxy_authorization_via_proxyinfo.js b/toolkit/components/extensions/test/xpcshell/test_ext_proxy_authorization_via_proxyinfo.js @@ -4,7 +4,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "authManager", "@mozilla.org/network/http-auth-manager;1", - Ci.nsIHttpAuthManager + "nsIHttpAuthManager" ); const proxy = createHttpServer(); diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_proxy_bypass_localhost.js b/toolkit/components/extensions/test/xpcshell/test_ext_proxy_bypass_localhost.js @@ -4,7 +4,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "authManager", "@mozilla.org/network/http-auth-manager;1", - Ci.nsIHttpAuthManager + "nsIHttpAuthManager" ); const gOverride = Cc["@mozilla.org/network/native-dns-override;1"].getService( diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_proxy_onauthrequired.js b/toolkit/components/extensions/test/xpcshell/test_ext_proxy_onauthrequired.js @@ -4,7 +4,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "authManager", "@mozilla.org/network/http-auth-manager;1", - Ci.nsIHttpAuthManager + "nsIHttpAuthManager" ); const proxy = createHttpServer(); diff --git a/toolkit/components/extensions/test/xpcshell/test_proxy_info_results.js b/toolkit/components/extensions/test/xpcshell/test_proxy_info_results.js @@ -4,7 +4,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "gProxyService", "@mozilla.org/network/protocol-proxy-service;1", - Ci.nsIProtocolProxyService + "nsIProtocolProxyService" ); const TRANSPARENT_PROXY_RESOLVES_HOST = diff --git a/toolkit/components/extensions/test/xpcshell/test_proxy_listener.js b/toolkit/components/extensions/test/xpcshell/test_proxy_listener.js @@ -4,7 +4,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "gProxyService", "@mozilla.org/network/protocol-proxy-service;1", - Ci.nsIProtocolProxyService + "nsIProtocolProxyService" ); const TRANSPARENT_PROXY_RESOLVES_HOST = diff --git a/toolkit/components/extensions/webrequest/SecurityInfo.sys.mjs b/toolkit/components/extensions/webrequest/SecurityInfo.sys.mjs @@ -10,14 +10,14 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "NSSErrorsService", "@mozilla.org/nss_errors_service;1", - Ci.nsINSSErrorsService + "nsINSSErrorsService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "pkps", "@mozilla.org/security/publickeypinningservice;1", - Ci.nsIPublicKeyPinningService + "nsIPublicKeyPinningService" ); // NOTE: SecurityInfo is largely reworked from the devtools NetworkHelper with changes diff --git a/toolkit/components/extensions/webrequest/WebRequestUpload.sys.mjs b/toolkit/components/extensions/webrequest/WebRequestUpload.sys.mjs @@ -14,7 +14,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "mimeHeader", "@mozilla.org/network/mime-hdrparam;1", - Ci.nsIMIMEHeaderParam + "nsIMIMEHeaderParam" ); const BinaryInputStream = Components.Constructor( diff --git a/toolkit/components/ml/actors/MLEngineChild.sys.mjs b/toolkit/components/ml/actors/MLEngineChild.sys.mjs @@ -56,7 +56,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "mlUtils", "@mozilla.org/ml-utils;1", - Ci.nsIMLUtils + "nsIMLUtils" ); XPCOMUtils.defineLazyPreferenceGetter( diff --git a/toolkit/components/ml/content/nlp/EmbeddingsGenerator.sys.mjs b/toolkit/components/ml/content/nlp/EmbeddingsGenerator.sys.mjs @@ -25,7 +25,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "mlUtils", "@mozilla.org/ml-utils;1", - Ci.nsIMLUtils + "nsIMLUtils" ); ChromeUtils.defineESModuleGetters(lazy, { diff --git a/toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.sys.mjs b/toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.sys.mjs @@ -36,7 +36,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "timerManager", "@mozilla.org/updates/timer-manager;1", - Ci.nsIUpdateTimerManager + "nsIUpdateTimerManager" ); const COLLECTION_ID_PREF = "messaging-system.rsexperimentloader.collection_id"; diff --git a/toolkit/components/normandy/lib/RecipeRunner.sys.mjs b/toolkit/components/normandy/lib/RecipeRunner.sys.mjs @@ -11,7 +11,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "timerManager", "@mozilla.org/updates/timer-manager;1", - Ci.nsIUpdateTimerManager + "nsIUpdateTimerManager" ); ChromeUtils.defineESModuleGetters(lazy, { diff --git a/toolkit/components/passwordmgr/LoginManagerChild.sys.mjs b/toolkit/components/passwordmgr/LoginManagerChild.sys.mjs @@ -62,7 +62,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gFormFillService", "@mozilla.org/satchel/form-fill-controller;1", - Ci.nsIFormFillController + "nsIFormFillController" ); ChromeUtils.defineLazyGetter(lazy, "log", () => { diff --git a/toolkit/components/passwordmgr/LoginManagerPrompter.sys.mjs b/toolkit/components/passwordmgr/LoginManagerPrompter.sys.mjs @@ -16,7 +16,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "usernameAutocompleteSearch", "@mozilla.org/autocomplete/search;1?name=login-doorhanger-username", - Ci.nsIAutoCompleteSimpleSearch + "nsIAutoCompleteSimpleSearch" ); ChromeUtils.defineLazyGetter(lazy, "l10n", () => { diff --git a/toolkit/components/pdfjs/content/PdfJs.sys.mjs b/toolkit/components/pdfjs/content/PdfJs.sys.mjs @@ -28,13 +28,13 @@ XPCOMUtils.defineLazyServiceGetter( Svc, "mime", "@mozilla.org/mime;1", - Ci.nsIMIMEService + "nsIMIMEService" ); XPCOMUtils.defineLazyServiceGetter( Svc, "handlerService", "@mozilla.org/uriloader/handler-service;1", - Ci.nsIHandlerService + "nsIHandlerService" ); // We're supposed to get this type of thing from the OS, and generally we do. diff --git a/toolkit/components/pdfjs/content/PdfStreamConverter.sys.mjs b/toolkit/components/pdfjs/content/PdfStreamConverter.sys.mjs @@ -42,13 +42,13 @@ XPCOMUtils.defineLazyServiceGetter( Svc, "mime", "@mozilla.org/mime;1", - Ci.nsIMIMEService + "nsIMIMEService" ); XPCOMUtils.defineLazyServiceGetter( Svc, "handlers", "@mozilla.org/uriloader/handler-service;1", - Ci.nsIHandlerService + "nsIHandlerService" ); ChromeUtils.defineLazyGetter(lazy, "gOurBinary", () => { diff --git a/toolkit/components/pdfjs/content/PdfjsParent.sys.mjs b/toolkit/components/pdfjs/content/PdfjsParent.sys.mjs @@ -46,7 +46,7 @@ XPCOMUtils.defineLazyServiceGetter( Svc, "mime", "@mozilla.org/mime;1", - Ci.nsIMIMEService + "nsIMIMEService" ); XPCOMUtils.defineLazyPreferenceGetter( diff --git a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs @@ -10,7 +10,7 @@ import { ShortcutUtils } from "resource://gre/modules/ShortcutUtils.sys.mjs"; const lazy = {}; XPCOMUtils.defineLazyServiceGetters(lazy, { - WindowsUIUtils: ["@mozilla.org/windows-ui-utils;1", Ci.nsIWindowsUIUtils], + WindowsUIUtils: ["@mozilla.org/windows-ui-utils;1", "nsIWindowsUIUtils"], }); ChromeUtils.defineESModuleGetters(lazy, { diff --git a/toolkit/components/places/History.sys.mjs b/toolkit/components/places/History.sys.mjs @@ -83,7 +83,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "asyncHistory", "@mozilla.org/browser/history;1", - Ci.mozIAsyncHistory + "mozIAsyncHistory" ); /** diff --git a/toolkit/components/places/PlacesExpiration.sys.mjs b/toolkit/components/places/PlacesExpiration.sys.mjs @@ -417,7 +417,7 @@ export function nsPlacesExpiration() { this, "_idle", "@mozilla.org/widget/useridleservice;1", - Ci.nsIUserIdleService + "nsIUserIdleService" ); // Max number of unique URIs to retain in history. diff --git a/toolkit/components/places/PlacesUtils.sys.mjs b/toolkit/components/places/PlacesUtils.sys.mjs @@ -3010,14 +3010,14 @@ XPCOMUtils.defineLazyServiceGetter( PlacesUtils, "favicons", "@mozilla.org/browser/favicon-service;1", - Ci.nsIFaviconService + "nsIFaviconService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "bmsvc", "@mozilla.org/browser/nav-bookmarks-service;1", - Ci.nsINavBookmarksService + "nsINavBookmarksService" ); ChromeUtils.defineLazyGetter(PlacesUtils, "bookmarks", () => { return Object.freeze( @@ -3034,7 +3034,7 @@ XPCOMUtils.defineLazyServiceGetter( PlacesUtils, "tagging", "@mozilla.org/browser/tagging-service;1", - Ci.nsITaggingService + "nsITaggingService" ); ChromeUtils.defineLazyGetter(lazy, "bundle", function () { diff --git a/toolkit/components/places/tests/history/test_async_history_api.js b/toolkit/components/places/tests/history/test_async_history_api.js @@ -8,7 +8,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "asyncHistory", "@mozilla.org/browser/history;1", - Ci.mozIAsyncHistory + "mozIAsyncHistory" ); const TEST_DOMAIN = "http://mozilla.org/"; diff --git a/toolkit/components/places/tests/history/test_updatePlaces_embed.js b/toolkit/components/places/tests/history/test_updatePlaces_embed.js @@ -9,7 +9,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "asyncHistory", "@mozilla.org/browser/history;1", - Ci.mozIAsyncHistory + "mozIAsyncHistory" ); add_task(async function test_embed_visit() { diff --git a/toolkit/components/satchel/integrations/WebAuthnFeature.sys.mjs b/toolkit/components/satchel/integrations/WebAuthnFeature.sys.mjs @@ -15,7 +15,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "webauthnService", "@mozilla.org/webauthn/service;1", - Ci.nsIWebAuthnService + "nsIWebAuthnService" ); ChromeUtils.defineLazyGetter( diff --git a/toolkit/components/satchel/megalist/aggregator/datasources/DataSourceBase.sys.mjs b/toolkit/components/satchel/megalist/aggregator/datasources/DataSourceBase.sys.mjs @@ -12,7 +12,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "ClipboardHelper", "@mozilla.org/widget/clipboardhelper;1", - Ci.nsIClipboardHelper + "nsIClipboardHelper" ); /** diff --git a/toolkit/components/taskscheduler/TaskSchedulerMacOSImpl.sys.mjs b/toolkit/components/taskscheduler/TaskSchedulerMacOSImpl.sys.mjs @@ -15,7 +15,7 @@ ChromeUtils.defineESModuleGetters(lazy, { XPCOMUtils.defineLazyServiceGetters(lazy, { XreDirProvider: [ "@mozilla.org/xre/directory-provider;1", - Ci.nsIXREDirProvider, + "nsIXREDirProvider", ], }); diff --git a/toolkit/components/taskscheduler/TaskSchedulerWinImpl.sys.mjs b/toolkit/components/taskscheduler/TaskSchedulerWinImpl.sys.mjs @@ -11,11 +11,11 @@ const lazy = {}; XPCOMUtils.defineLazyServiceGetters(lazy, { WinTaskSvc: [ "@mozilla.org/win-task-scheduler-service;1", - Ci.nsIWinTaskSchedulerService, + "nsIWinTaskSchedulerService", ], XreDirProvider: [ "@mozilla.org/xre/directory-provider;1", - Ci.nsIXREDirProvider, + "nsIXREDirProvider", ], }); diff --git a/toolkit/components/telemetry/app/TelemetryEnvironment.sys.mjs b/toolkit/components/telemetry/app/TelemetryEnvironment.sys.mjs @@ -40,7 +40,7 @@ if (AppConstants.MOZ_UPDATER) { lazy, "UpdateServiceStub", "@mozilla.org/updates/update-service-stub;1", - Ci.nsIApplicationUpdateServiceStub + "nsIApplicationUpdateServiceStub" ); } diff --git a/toolkit/components/telemetry/app/TelemetryScheduler.sys.mjs b/toolkit/components/telemetry/app/TelemetryScheduler.sys.mjs @@ -12,7 +12,7 @@ import { clearTimeout, setTimeout } from "resource://gre/modules/Timer.sys.mjs"; const lazy = {}; XPCOMUtils.defineLazyServiceGetters(lazy, { - idleService: ["@mozilla.org/widget/useridleservice;1", Ci.nsIUserIdleService], + idleService: ["@mozilla.org/widget/useridleservice;1", "nsIUserIdleService"], }); const MIN_SUBSESSION_LENGTH_MS = diff --git a/toolkit/components/telemetry/pings/UntrustedModulesPing.sys.mjs b/toolkit/components/telemetry/pings/UntrustedModulesPing.sys.mjs @@ -22,7 +22,7 @@ ChromeUtils.defineESModuleGetters(lazy, { XPCOMUtils.defineLazyServiceGetters(lazy, { UpdateTimerManager: [ "@mozilla.org/updates/timer-manager;1", - Ci.nsIUpdateTimerManager, + "nsIUpdateTimerManager", ], }); diff --git a/toolkit/components/thumbnails/PageThumbs.sys.mjs b/toolkit/components/thumbnails/PageThumbs.sys.mjs @@ -33,14 +33,14 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gUpdateTimerManager", "@mozilla.org/updates/timer-manager;1", - Ci.nsIUpdateTimerManager + "nsIUpdateTimerManager" ); XPCOMUtils.defineLazyServiceGetter( lazy, "PageThumbsStorageService", "@mozilla.org/thumbnails/pagethumbs-service;1", - Ci.nsIPageThumbsStorageService + "nsIPageThumbsStorageService" ); /** diff --git a/toolkit/components/thumbnails/test/head.js b/toolkit/components/thumbnails/test/head.js @@ -15,7 +15,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "PageThumbsStorageService", "@mozilla.org/thumbnails/pagethumbs-service;1", - Ci.nsIPageThumbsStorageService + "nsIPageThumbsStorageService" ); var oldEnabledPref = Services.prefs.getBoolPref( diff --git a/toolkit/components/timermanager/tests/unit/test_skipFirst.js b/toolkit/components/timermanager/tests/unit/test_skipFirst.js @@ -11,7 +11,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "gUpdateTimerManager", "@mozilla.org/updates/timer-manager;1", - Ci.nsIUpdateTimerManager + "nsIUpdateTimerManager" ); const PREF_APP_UPDATE_LASTUPDATETIME_FMT = "app.update.lastUpdateTime.%ID%"; diff --git a/toolkit/components/translations/actors/TranslationsParent.sys.mjs b/toolkit/components/translations/actors/TranslationsParent.sys.mjs @@ -62,14 +62,14 @@ if (AppConstants.ENABLE_WEBDRIVER) { lazy, "Marionette", "@mozilla.org/remote/marionette;1", - Ci.nsIMarionette + "nsIMarionette" ); XPCOMUtils.defineLazyServiceGetter( lazy, "RemoteAgent", "@mozilla.org/remote/agent;1", - Ci.nsIRemoteAgent + "nsIRemoteAgent" ); } else { lazy.Marionette = { running: false }; @@ -77,7 +77,7 @@ if (AppConstants.ENABLE_WEBDRIVER) { } XPCOMUtils.defineLazyServiceGetters(lazy, { - BrowserHandler: ["@mozilla.org/browser/clh;1", Ci.nsIBrowserHandler], + BrowserHandler: ["@mozilla.org/browser/clh;1", "nsIBrowserHandler"], }); ChromeUtils.defineESModuleGetters(lazy, { diff --git a/toolkit/components/url-classifier/UrlClassifierHashCompleter.sys.mjs b/toolkit/components/url-classifier/UrlClassifierHashCompleter.sys.mjs @@ -22,14 +22,14 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gDbService", "@mozilla.org/url-classifier/dbservice;1", - Ci.nsIUrlClassifierDBService + "nsIUrlClassifierDBService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "gUrlUtil", "@mozilla.org/url-classifier/utils;1", - Ci.nsIUrlClassifierUtils + "nsIUrlClassifierUtils" ); let loggingEnabled = false; diff --git a/toolkit/components/url-classifier/tests/unit/test_hashcompleter_v4.js b/toolkit/components/url-classifier/tests/unit/test_hashcompleter_v4.js @@ -56,7 +56,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "gUrlUtil", "@mozilla.org/url-classifier/utils;1", - Ci.nsIUrlClassifierUtils + "nsIUrlClassifierUtils" ); // Handles request for TEST_TABLE_DATA_V4. diff --git a/toolkit/components/utils/SimpleServices.sys.mjs b/toolkit/components/utils/SimpleServices.sys.mjs @@ -22,7 +22,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "streamConv", "@mozilla.org/streamConverters;1", - Ci.nsIStreamConverterService + "nsIStreamConverterService" ); const ArrayBufferInputStream = Components.Constructor( "@mozilla.org/io/arraybuffer-input-stream;1", diff --git a/toolkit/content/aboutProfiles.js b/toolkit/content/aboutProfiles.js @@ -12,7 +12,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "ProfileService", "@mozilla.org/toolkit/profile-service;1", - Ci.nsIToolkitProfileService + "nsIToolkitProfileService" ); async function flush() { diff --git a/toolkit/modules/ContentDOMReference.sys.mjs b/toolkit/modules/ContentDOMReference.sys.mjs @@ -22,7 +22,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "finalizationService", "@mozilla.org/toolkit/finalizationwitness;1", - Ci.nsIFinalizationWitnessService + "nsIFinalizationWitnessService" ); /** diff --git a/toolkit/modules/E10SUtils.sys.mjs b/toolkit/modules/E10SUtils.sys.mjs @@ -43,13 +43,13 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "serializationHelper", "@mozilla.org/network/serialization-helper;1", - Ci.nsISerializationHelper + "nsISerializationHelper" ); XPCOMUtils.defineLazyServiceGetter( lazy, "extProtService", "@mozilla.org/uriloader/external-protocol-service;1", - Ci.nsIExternalProtocolService + "nsIExternalProtocolService" ); function getOriginalReaderModeURI(aURI) { diff --git a/toolkit/modules/Finder.sys.mjs b/toolkit/modules/Finder.sys.mjs @@ -22,7 +22,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "ClipboardHelper", "@mozilla.org/widget/clipboardhelper;1", - Ci.nsIClipboardHelper + "nsIClipboardHelper" ); const kSelectionMaxLen = 150; diff --git a/toolkit/modules/NewTabUtils.sys.mjs b/toolkit/modules/NewTabUtils.sys.mjs @@ -35,7 +35,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "IDNService", "@mozilla.org/network/idn-service;1", - Ci.nsIIDNService + "nsIIDNService" ); // The maximum number of results PlacesProvider retrieves from history. diff --git a/toolkit/modules/Region.sys.mjs b/toolkit/modules/Region.sys.mjs @@ -79,7 +79,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "timerManager", "@mozilla.org/updates/timer-manager;1", - Ci.nsIUpdateTimerManager + "nsIUpdateTimerManager" ); const log = console.createInstance({ diff --git a/toolkit/modules/ServiceRequest.sys.mjs b/toolkit/modules/ServiceRequest.sys.mjs @@ -15,7 +15,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "ProxyService", "@mozilla.org/network/protocol-proxy-service;1", - Ci.nsIProtocolProxyService + "nsIProtocolProxyService" ); ChromeUtils.defineESModuleGetters(lazy, { @@ -27,14 +27,14 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "CaptivePortalService", "@mozilla.org/network/captive-portal-service;1", - Ci.nsICaptivePortalService + "nsICaptivePortalService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "gNetworkLinkService", "@mozilla.org/network/network-link-service;1", - Ci.nsINetworkLinkService + "nsINetworkLinkService" ); const PROXY_CONFIG_TYPES = [ diff --git a/toolkit/modules/Sqlite.sys.mjs b/toolkit/modules/Sqlite.sys.mjs @@ -36,7 +36,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "FinalizationWitnessService", "@mozilla.org/toolkit/finalizationwitness;1", - Ci.nsIFinalizationWitnessService + "nsIFinalizationWitnessService" ); // Regular expression used by isInvalidBoundLikeQuery diff --git a/toolkit/modules/SubDialog.sys.mjs b/toolkit/modules/SubDialog.sys.mjs @@ -10,7 +10,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "dragService", "@mozilla.org/widget/dragservice;1", - Ci.nsIDragService + "nsIDragService" ); const HTML_NS = "http://www.w3.org/1999/xhtml"; diff --git a/toolkit/mozapps/defaultagent/BackgroundTask_defaultagent.sys.mjs b/toolkit/mozapps/defaultagent/BackgroundTask_defaultagent.sys.mjs @@ -21,7 +21,7 @@ ChromeUtils.defineESModuleGetters(lazy, { ShellService: "moz-src:///browser/components/shell/ShellService.sys.mjs", }); XPCOMUtils.defineLazyServiceGetters(lazy, { - AlertsService: ["@mozilla.org/alerts-service;1", Ci.nsIAlertsService], + AlertsService: ["@mozilla.org/alerts-service;1", "nsIAlertsService"], }); ChromeUtils.defineLazyGetter(lazy, "log", () => { let { ConsoleAPI } = ChromeUtils.importESModule( diff --git a/toolkit/mozapps/downloads/DownloadLastDir.sys.mjs b/toolkit/mozapps/downloads/DownloadLastDir.sys.mjs @@ -36,7 +36,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "cps2", "@mozilla.org/content-pref/service;1", - Ci.nsIContentPrefService2 + "nsIContentPrefService2" ); let nonPrivateLoadContext = Cu.createLoadContext(); diff --git a/toolkit/mozapps/downloads/DownloadUtils.sys.mjs b/toolkit/mozapps/downloads/DownloadUtils.sys.mjs @@ -60,7 +60,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "IDNService", "@mozilla.org/network/idn-service;1", - Ci.nsIIDNService + "nsIIDNService" ); var localeNumberFormatCache = new Map(); diff --git a/toolkit/mozapps/extensions/amContentHandler.sys.mjs b/toolkit/mozapps/extensions/amContentHandler.sys.mjs @@ -10,7 +10,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; XPCOMUtils.defineLazyServiceGetters(lazy, { - ThirdPartyUtil: ["@mozilla.org/thirdpartyutil;1", Ci.mozIThirdPartyUtil], + ThirdPartyUtil: ["@mozilla.org/thirdpartyutil;1", "mozIThirdPartyUtil"], }); export function amContentHandler() {} diff --git a/toolkit/mozapps/extensions/internal/AddonTestUtils.sys.mjs b/toolkit/mozapps/extensions/internal/AddonTestUtils.sys.mjs @@ -37,7 +37,7 @@ ChromeUtils.defineESModuleGetters(lazy, { XPCOMUtils.defineLazyServiceGetters(lazy, { aomStartup: [ "@mozilla.org/addons/addon-manager-startup;1", - Ci.amIAddonManagerStartup, + "amIAddonManagerStartup", ], }); diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.sys.mjs b/toolkit/mozapps/extensions/internal/XPIInstall.sys.mjs @@ -82,7 +82,7 @@ const ZipReader = Components.Constructor( ); XPCOMUtils.defineLazyServiceGetters(lazy, { - gCertDB: ["@mozilla.org/security/x509certdb;1", Ci.nsIX509CertDB], + gCertDB: ["@mozilla.org/security/x509certdb;1", "nsIX509CertDB"], }); const PREF_INSTALL_REQUIRESECUREORIGIN = diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs b/toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs @@ -39,19 +39,16 @@ ChromeUtils.defineESModuleGetters(lazy, { XPCOMUtils.defineLazyServiceGetters(lazy, { aomStartup: [ "@mozilla.org/addons/addon-manager-startup;1", - Ci.amIAddonManagerStartup, + "amIAddonManagerStartup", ], resProto: [ "@mozilla.org/network/protocol;1?name=resource", - Ci.nsISubstitutingProtocolHandler, - ], - spellCheck: [ - "@mozilla.org/spellchecker/engine;1", - Ci.mozISpellCheckingEngine, + "nsISubstitutingProtocolHandler", ], + spellCheck: ["@mozilla.org/spellchecker/engine;1", "mozISpellCheckingEngine"], timerManager: [ "@mozilla.org/updates/timer-manager;1", - Ci.nsIUpdateTimerManager, + "nsIUpdateTimerManager", ], }); diff --git a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js @@ -70,7 +70,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "aomStartup", "@mozilla.org/addons/addon-manager-startup;1", - Ci.amIAddonManagerStartup + "amIAddonManagerStartup" ); const { diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_dictionary_webextension.js b/toolkit/mozapps/extensions/test/xpcshell/test_dictionary_webextension.js @@ -7,7 +7,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "spellCheck", "@mozilla.org/spellchecker/engine;1", - Ci.mozISpellCheckingEngine + "mozISpellCheckingEngine" ); add_setup(async function setup() { diff --git a/toolkit/mozapps/update/AppUpdater.sys.mjs b/toolkit/mozapps/update/AppUpdater.sys.mjs @@ -782,19 +782,19 @@ XPCOMUtils.defineLazyServiceGetter( AppUpdater.prototype, "aus", "@mozilla.org/updates/update-service;1", - Ci.nsIApplicationUpdateService + "nsIApplicationUpdateService" ); XPCOMUtils.defineLazyServiceGetter( AppUpdater.prototype, "checker", "@mozilla.org/updates/update-checker;1", - Ci.nsIUpdateChecker + "nsIUpdateChecker" ); XPCOMUtils.defineLazyServiceGetter( AppUpdater.prototype, "um", "@mozilla.org/updates/update-manager;1", - Ci.nsIUpdateManager + "nsIUpdateManager" ); AppUpdater.STATUS = { diff --git a/toolkit/mozapps/update/BackgroundTask_backgroundupdate.sys.mjs b/toolkit/mozapps/update/BackgroundTask_backgroundupdate.sys.mjs @@ -25,7 +25,7 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "UpdateService", "@mozilla.org/updates/update-service;1", - Ci.nsIApplicationUpdateService + "nsIApplicationUpdateService" ); ChromeUtils.defineLazyGetter(lazy, "log", () => { diff --git a/toolkit/mozapps/update/BackgroundUpdate.sys.mjs b/toolkit/mozapps/update/BackgroundUpdate.sys.mjs @@ -44,10 +44,10 @@ ChromeUtils.defineLazyGetter(lazy, "localization", () => { }); XPCOMUtils.defineLazyServiceGetters(lazy, { - idleService: ["@mozilla.org/widget/useridleservice;1", Ci.nsIUserIdleService], + idleService: ["@mozilla.org/widget/useridleservice;1", "nsIUserIdleService"], UpdateService: [ "@mozilla.org/updates/update-service;1", - Ci.nsIApplicationUpdateService, + "nsIApplicationUpdateService", ], }); diff --git a/toolkit/mozapps/update/UpdateListener.sys.mjs b/toolkit/mozapps/update/UpdateListener.sys.mjs @@ -17,14 +17,14 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "AppUpdateService", "@mozilla.org/updates/update-service;1", - Ci.nsIApplicationUpdateService + "nsIApplicationUpdateService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "UpdateManager", "@mozilla.org/updates/update-manager;1", - Ci.nsIUpdateManager + "nsIUpdateManager" ); const PREF_APP_UPDATE_UNSUPPORTED_URL = "app.update.unsupported.url"; diff --git a/toolkit/mozapps/update/UpdateService.sys.mjs b/toolkit/mozapps/update/UpdateService.sys.mjs @@ -32,31 +32,31 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "AUS", "@mozilla.org/updates/update-service;1", - Ci.nsIApplicationUpdateService + "nsIApplicationUpdateService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "UM", "@mozilla.org/updates/update-manager;1", - Ci.nsIUpdateManager + "nsIUpdateManager" ); XPCOMUtils.defineLazyServiceGetter( lazy, "CheckSvc", "@mozilla.org/updates/update-checker;1", - Ci.nsIUpdateChecker + "nsIUpdateChecker" ); XPCOMUtils.defineLazyServiceGetter( lazy, "UpdateServiceStub", "@mozilla.org/updates/update-service-stub;1", - Ci.nsIApplicationUpdateServiceStub + "nsIApplicationUpdateServiceStub" ); XPCOMUtils.defineLazyServiceGetter( lazy, "UpdateMutex", "@mozilla.org/updates/update-mutex;1", - Ci.nsIUpdateMutex + "nsIUpdateMutex" ); const UPDATESERVICE_CID = Components.ID( diff --git a/toolkit/mozapps/update/UpdateServiceStub.sys.mjs b/toolkit/mozapps/update/UpdateServiceStub.sys.mjs @@ -18,14 +18,14 @@ if (AppConstants.ENABLE_WEBDRIVER) { lazy, "Marionette", "@mozilla.org/remote/marionette;1", - Ci.nsIMarionette + "nsIMarionette" ); XPCOMUtils.defineLazyServiceGetter( lazy, "RemoteAgent", "@mozilla.org/remote/agent;1", - Ci.nsIRemoteAgent + "nsIRemoteAgent" ); } else { lazy.Marionette = { running: false }; diff --git a/toolkit/mozapps/update/tests/data/shared.js b/toolkit/mozapps/update/tests/data/shared.js @@ -152,14 +152,14 @@ XPCOMUtils.defineLazyServiceGetter( this, "gUpdateManager", "@mozilla.org/updates/update-manager;1", - Ci.nsIUpdateManager + "nsIUpdateManager" ); XPCOMUtils.defineLazyServiceGetter( this, "gUpdateChecker", "@mozilla.org/updates/update-checker;1", - Ci.nsIUpdateChecker + "nsIUpdateChecker" ); ChromeUtils.defineLazyGetter(this, "gDefaultPrefBranch", function test_gDPB() { diff --git a/toolkit/mozapps/update/tests/unit_background_update/test_backgroundupdate_glean.js b/toolkit/mozapps/update/tests/unit_background_update/test_backgroundupdate_glean.js @@ -26,7 +26,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "UpdateService", "@mozilla.org/updates/update-service;1", - Ci.nsIApplicationUpdateService + "nsIApplicationUpdateService" ); add_setup(function test_setup() { diff --git a/tools/lint/eslint/eslint-plugin-mozilla/lib/rules/use-services.mjs b/tools/lint/eslint/eslint-plugin-mozilla/lib/rules/use-services.mjs @@ -35,12 +35,10 @@ export default { node.callee.property.type == "Identifier" && node.callee.property.name == "defineLazyServiceGetter" && node.arguments.length == 4 && - node.arguments[3].type == "MemberExpression" && - node.arguments[3].property.type == "Identifier" && - node.arguments[3].property.name in servicesInterfaceMap + node.arguments[3].type == "Literal" && + node.arguments[3].value in servicesInterfaceMap ) { - let serviceName = - servicesInterfaceMap[node.arguments[3].property.name]; + let serviceName = servicesInterfaceMap[node.arguments[3].value]; context.report({ node, @@ -63,12 +61,10 @@ export default { if ( property.value.type == "ArrayExpression" && property.value.elements.length == 2 && - property.value.elements[1].type == "MemberExpression" && - property.value.elements[1].property.type == "Identifier" && - property.value.elements[1].property.name in servicesInterfaceMap + property.value.elements[1].value in servicesInterfaceMap ) { let serviceName = - servicesInterfaceMap[property.value.elements[1].property.name]; + servicesInterfaceMap[property.value.elements[1].value]; context.report({ node: property.value, diff --git a/tools/lint/eslint/eslint-plugin-mozilla/tests/reject-lazy-imports-into-globals.mjs b/tools/lint/eslint/eslint-plugin-mozilla/tests/reject-lazy-imports-into-globals.mjs @@ -32,7 +32,7 @@ ruleTester.run("reject-lazy-imports-into-globals", rule, { `XPCOMUtils.defineLazyPreferenceGetter(globalThis, "foo", "foo.bar");` ), invalidCode( - `XPCOMUtils.defineLazyServiceGetter(globalThis, "foo", "@foo", Ci.nsIFoo);` + `XPCOMUtils.defineLazyServiceGetter(globalThis, "foo", "@foo", "nsIFoo");` ), invalidCode(`XPCOMUtils.defineLazyGlobalGetters(globalThis, {});`), invalidCode(`XPCOMUtils.defineLazyGlobalGetters(window, {});`), diff --git a/tools/lint/eslint/eslint-plugin-mozilla/tests/use-services.mjs b/tools/lint/eslint/eslint-plugin-mozilla/tests/use-services.mjs @@ -42,7 +42,7 @@ ruleTester.run("use-services", rule, { ), invalidCode( `XPCOMUtils.defineLazyServiceGetters(this, { - uuidGen: ["@mozilla.org/uuid-generator;1", Ci.nsIUUIDGenerator], + uuidGen: ["@mozilla.org/uuid-generator;1", "nsIUUIDGenerator"], });`, "uuid", "defineLazyServiceGetters", @@ -53,7 +53,7 @@ ruleTester.run("use-services", rule, { this, "gELS", "@mozilla.org/eventlistenerservice;1", - Ci.nsIEventListenerService + "nsIEventListenerService" );`, "els", "defineLazyServiceGetter" diff --git a/uriloader/exthandler/ExtHandlerService.sys.mjs b/uriloader/exthandler/ExtHandlerService.sys.mjs @@ -28,13 +28,13 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "externalProtocolService", "@mozilla.org/uriloader/external-protocol-service;1", - Ci.nsIExternalProtocolService + "nsIExternalProtocolService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "MIMEService", "@mozilla.org/mime;1", - Ci.nsIMIMEService + "nsIMIMEService" ); export function HandlerService() { diff --git a/uriloader/exthandler/tests/HandlerServiceTestUtils.sys.mjs b/uriloader/exthandler/tests/HandlerServiceTestUtils.sys.mjs @@ -16,19 +16,19 @@ XPCOMUtils.defineLazyServiceGetter( lazy, "gExternalProtocolService", "@mozilla.org/uriloader/external-protocol-service;1", - Ci.nsIExternalProtocolService + "nsIExternalProtocolService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "gMIMEService", "@mozilla.org/mime;1", - Ci.nsIMIMEService + "nsIMIMEService" ); XPCOMUtils.defineLazyServiceGetter( lazy, "gHandlerService", "@mozilla.org/uriloader/handler-service;1", - Ci.nsIHandlerService + "nsIHandlerService" ); export var HandlerServiceTestUtils = { diff --git a/uriloader/exthandler/tests/mochitest/browser_web_handler_app_pinned_tab.js b/uriloader/exthandler/tests/mochitest/browser_web_handler_app_pinned_tab.js @@ -15,13 +15,13 @@ XPCOMUtils.defineLazyServiceGetter( this, "gExternalProtocolService", "@mozilla.org/uriloader/external-protocol-service;1", - Ci.nsIExternalProtocolService + "nsIExternalProtocolService" ); XPCOMUtils.defineLazyServiceGetter( this, "gHandlerService", "@mozilla.org/uriloader/handler-service;1", - Ci.nsIHandlerService + "nsIHandlerService" ); let prevAlwaysAskBeforeHandling; diff --git a/uriloader/exthandler/tests/unit/head.js b/uriloader/exthandler/tests/unit/head.js @@ -32,7 +32,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "gHandlerService", "@mozilla.org/uriloader/handler-service;1", - Ci.nsIHandlerService + "nsIHandlerService" ); do_get_profile(); diff --git a/uriloader/exthandler/tests/unit/test_defaults_handlerService.js b/uriloader/exthandler/tests/unit/test_defaults_handlerService.js @@ -7,7 +7,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "gExternalProtocolService", "@mozilla.org/uriloader/external-protocol-service;1", - Ci.nsIExternalProtocolService + "nsIExternalProtocolService" ); ChromeUtils.defineESModuleGetters(this, { kHandlerList: "resource://gre/modules/handlers/HandlerList.sys.mjs", diff --git a/uriloader/exthandler/tests/unit/test_getMIMEInfo_pdf.js b/uriloader/exthandler/tests/unit/test_getMIMEInfo_pdf.js @@ -7,7 +7,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "gMIMEService", "@mozilla.org/mime;1", - Ci.nsIMIMEService + "nsIMIMEService" ); // PDF files should always have a generic description instead