From f3a8c52c53ad14e502f1854dd3608c3c00012c28 Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Mon, 11 Jul 2022 12:41:50 +0000
Subject: [PATCH] Bug 1667455 - Part 4: Stop importing Services.jsm from JSM.
r=kmag,webdriver-reviewers,perftest-reviewers,webcompat-reviewers,geckoview-reviewers,application-update-reviewers,pip-reviewers,twisniewski,devtools-reviewers,m_kato,jdescottes,ochameau,mconley,sfoster,AlexandruIonescu
Differential Revision: https://phabricator.services.mozilla.com/D150893
---
accessible/tests/browser/Common.jsm | 1 -
browser/actors/AboutNewTabChild.jsm | 1 -
browser/actors/AboutPrivateBrowsingChild.jsm | 2 --
browser/actors/AboutPrivateBrowsingParent.jsm | 1 -
browser/actors/AboutProtectionsChild.jsm | 1 -
browser/actors/AboutProtectionsParent.jsm | 1 -
browser/actors/AboutReaderParent.jsm | 2 --
browser/actors/BlockedSiteChild.jsm | 2 --
browser/actors/BlockedSiteParent.jsm | 1 -
browser/actors/BrowserTabChild.jsm | 2 --
browser/actors/ClickHandlerChild.jsm | 1 -
browser/actors/ContentSearchParent.jsm | 1 -
browser/actors/ContextMenuChild.jsm | 1 -
browser/actors/DOMFullscreenChild.jsm | 2 --
browser/actors/DOMFullscreenParent.jsm | 2 --
browser/actors/DecoderDoctorParent.jsm | 1 -
browser/actors/EncryptedMediaChild.jsm | 2 --
browser/actors/EncryptedMediaParent.jsm | 1 -
browser/actors/FormValidationChild.jsm | 1 -
browser/actors/FormValidationParent.jsm | 2 --
browser/actors/LightweightThemeChild.jsm | 2 --
browser/actors/LinkHandlerChild.jsm | 2 --
browser/actors/LinkHandlerParent.jsm | 2 --
browser/actors/NetErrorChild.jsm | 1 -
browser/actors/NetErrorParent.jsm | 1 -
browser/actors/PageInfoChild.jsm | 1 -
browser/actors/PluginParent.jsm | 1 -
browser/actors/PromptParent.jsm | 1 -
browser/actors/RefreshBlockerChild.jsm | 1 -
browser/actors/SearchSERPTelemetryChild.jsm | 1 -
browser/actors/WebRTCChild.jsm | 1 -
browser/actors/WebRTCParent.jsm | 1 -
.../test/performance/StartupContentSubframe.jsm | 1 -
browser/components/BrowserContentHandler.jsm | 1 -
browser/components/BrowserGlue.jsm | 1 -
browser/components/StartupRecorder.jsm | 1 -
browser/components/aboutlogins/AboutLoginsChild.jsm | 1 -
browser/components/aboutlogins/AboutLoginsParent.jsm | 1 -
browser/components/aboutlogins/LoginBreaches.jsm | 1 -
browser/components/attribution/AttributionCode.jsm | 1 -
browser/components/attribution/MacAttribution.jsm | 1 -
browser/components/customizableui/CustomizableUI.jsm | 1 -
.../components/customizableui/CustomizableWidgets.jsm | 1 -
browser/components/customizableui/CustomizeMode.jsm | 1 -
browser/components/customizableui/PanelMultiView.jsm | 1 -
.../components/customizableui/SearchWidgetTracker.jsm | 1 -
browser/components/doh/DoHConfig.jsm | 1 -
browser/components/doh/DoHController.jsm | 1 -
browser/components/doh/DoHHeuristics.jsm | 1 -
browser/components/doh/TRRPerformance.jsm | 2 --
browser/components/downloads/DownloadsCommon.jsm | 1 -
browser/components/downloads/DownloadsTaskbar.jsm | 1 -
.../downloads/DownloadsViewableInternally.jsm | 1 -
browser/components/enterprisepolicies/Policies.jsm | 1 -
.../enterprisepolicies/helpers/BookmarksPolicies.jsm | 1 -
.../enterprisepolicies/helpers/WebsiteFilter.jsm | 1 -
.../components/extensions/ExtensionControlledPopup.jsm | 1 -
.../components/extensions/test/AppUiTestDelegate.jsm | 1 -
browser/components/installerprefs/InstallerPrefs.jsm | 1 -
browser/components/migration/ChromeMigrationUtils.jsm | 1 -
browser/components/migration/ChromeProfileMigrator.jsm | 1 -
browser/components/migration/ESEDBReader.jsm | 1 -
.../components/migration/FirefoxProfileMigrator.jsm | 1 -
browser/components/migration/IEProfileMigrator.jsm | 1 -
browser/components/migration/MSMigrationUtils.jsm | 1 -
browser/components/migration/MigrationUtils.jsm | 1 -
browser/components/newtab/AboutNewTabService.jsm | 1 -
.../newtab/aboutwelcome/AboutWelcomeParent.jsm | 1 -
.../newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm | 1 -
.../newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm | 1 -
browser/components/newtab/lib/ASRouter.jsm | 1 -
browser/components/newtab/lib/ASRouterPreferences.jsm | 1 -
browser/components/newtab/lib/ASRouterTargeting.jsm | 1 -
.../components/newtab/lib/ASRouterTriggerListeners.jsm | 1 -
browser/components/newtab/lib/AboutPreferences.jsm | 1 -
browser/components/newtab/lib/ActivityStream.jsm | 2 --
browser/components/newtab/lib/CFRPageActions.jsm | 1 -
browser/components/newtab/lib/DiscoveryStreamFeed.jsm | 1 -
browser/components/newtab/lib/FaviconFeed.jsm | 1 -
browser/components/newtab/lib/FilterAdult.jsm | 2 --
browser/components/newtab/lib/HighlightsFeed.jsm | 2 --
browser/components/newtab/lib/InfoBar.jsm | 1 -
browser/components/newtab/lib/MomentsPageHub.jsm | 1 -
.../newtab/lib/OnboardingMessageProvider.jsm | 1 -
.../lib/PersonalityProvider/PersonalityProvider.jsm | 2 --
browser/components/newtab/lib/PlacesFeed.jsm | 1 -
browser/components/newtab/lib/PrefsFeed.jsm | 1 -
browser/components/newtab/lib/RemoteImages.jsm | 1 -
browser/components/newtab/lib/RemoteL10n.jsm | 2 --
browser/components/newtab/lib/Screenshots.jsm | 1 -
browser/components/newtab/lib/SearchShortcuts.jsm | 2 --
browser/components/newtab/lib/SectionsManager.jsm | 1 -
browser/components/newtab/lib/ShortURL.jsm | 1 -
browser/components/newtab/lib/TelemetryFeed.jsm | 1 -
browser/components/newtab/lib/TippyTopProvider.jsm | 2 --
browser/components/newtab/lib/ToolbarBadgeHub.jsm | 1 -
browser/components/newtab/lib/ToolbarPanelHub.jsm | 1 -
browser/components/newtab/lib/TopSitesFeed.jsm | 1 -
browser/components/newtab/lib/TopStoriesFeed.jsm | 1 -
browser/components/newtab/lib/UTEventReporting.jsm | 2 --
.../components/newtab/test/RemoteImagesTestUtils.jsm | 1 -
browser/components/pagedata/PageDataSchema.jsm | 1 -
browser/components/pagedata/PageDataService.jsm | 1 -
browser/components/places/Interactions.jsm | 1 -
browser/components/places/InteractionsBlocklist.jsm | 1 -
browser/components/places/InteractionsChild.jsm | 1 -
browser/components/places/PlacesUIUtils.jsm | 1 -
browser/components/places/SnapshotGroups.jsm | 1 -
browser/components/places/SnapshotMonitor.jsm | 1 -
browser/components/places/SnapshotScorer.jsm | 1 -
browser/components/places/SnapshotSelector.jsm | 1 -
browser/components/places/Snapshots.jsm | 1 -
browser/components/pocket/content/Pocket.jsm | 2 --
browser/components/pocket/content/SaveToPocket.jsm | 1 -
browser/components/pocket/content/pktApi.jsm | 1 -
browser/components/pocket/content/pktTelemetry.jsm | 1 -
browser/components/prompts/PromptCollection.jsm | 1 -
.../protocolhandler/WebProtocolHandlerRegistrar.jsm | 2 --
browser/components/screenshots/ScreenshotsUtils.jsm | 2 --
browser/components/search/BrowserSearchTelemetry.jsm | 1 -
browser/components/search/SearchOneOffs.jsm | 1 -
browser/components/search/SearchSERPTelemetry.jsm | 1 -
browser/components/search/SearchUIUtils.jsm | 1 -
browser/components/sessionstore/ContentRestore.jsm | 2 --
.../components/sessionstore/ContentSessionStore.jsm | 1 -
.../RecentlyClosedTabsAndWindowsMenuUtils.jsm | 2 --
browser/components/sessionstore/SessionCookies.jsm | 2 --
browser/components/sessionstore/SessionFile.jsm | 1 -
browser/components/sessionstore/SessionSaver.jsm | 1 -
browser/components/sessionstore/SessionStartup.jsm | 2 --
browser/components/sessionstore/SessionStore.jsm | 1 -
browser/components/sessionstore/StartupPerformance.jsm | 1 -
browser/components/sessionstore/TabStateFlusher.jsm | 1 -
browser/components/shell/HeadlessShell.jsm | 1 -
browser/components/shell/ShellService.jsm | 1 -
browser/components/touchbar/MacTouchBar.jsm | 1 -
browser/components/translation/BingTranslator.jsm | 1 -
browser/components/translation/GoogleTranslator.jsm | 1 -
browser/components/translation/TranslationChild.jsm | 1 -
browser/components/translation/TranslationParent.jsm | 2 --
browser/components/translation/YandexTranslator.jsm | 1 -
browser/components/uitour/UITour.jsm | 1 -
browser/components/uitour/UITourChild.jsm | 2 --
.../components/urlbar/QuickActionsLoaderDefault.jsm | 1 -
browser/components/urlbar/UrlbarController.jsm | 1 -
browser/components/urlbar/UrlbarEventBufferer.jsm | 1 -
browser/components/urlbar/UrlbarInput.jsm | 1 -
.../components/urlbar/UrlbarMuxerUnifiedComplete.jsm | 1 -
browser/components/urlbar/UrlbarPrefs.jsm | 1 -
browser/components/urlbar/UrlbarProviderExtension.jsm | 1 -
.../urlbar/UrlbarProviderHeuristicFallback.jsm | 1 -
.../components/urlbar/UrlbarProviderInterventions.jsm | 1 -
browser/components/urlbar/UrlbarProviderPlaces.jsm | 1 -
.../components/urlbar/UrlbarProviderPreloadedSites.jsm | 1 -
.../components/urlbar/UrlbarProviderPrivateSearch.jsm | 1 -
.../components/urlbar/UrlbarProviderQuickActions.jsm | 1 -
.../components/urlbar/UrlbarProviderQuickSuggest.jsm | 1 -
browser/components/urlbar/UrlbarProviderRemoteTabs.jsm | 1 -
.../urlbar/UrlbarProviderSearchSuggestions.jsm | 1 -
browser/components/urlbar/UrlbarProviderSearchTips.jsm | 1 -
.../components/urlbar/UrlbarProviderTabToSearch.jsm | 1 -
browser/components/urlbar/UrlbarProviderTopSites.jsm | 1 -
browser/components/urlbar/UrlbarQuickSuggest.jsm | 1 -
browser/components/urlbar/UrlbarSearchOneOffs.jsm | 1 -
browser/components/urlbar/UrlbarSearchUtils.jsm | 1 -
browser/components/urlbar/UrlbarTokenizer.jsm | 2 +-
browser/components/urlbar/UrlbarUtils.jsm | 2 +-
browser/components/urlbar/UrlbarValueFormatter.jsm | 1 -
browser/components/urlbar/UrlbarView.jsm | 2 +-
browser/components/urlbar/tests/UrlbarTestUtils.jsm | 1 -
.../tests/quicksuggest/QuickSuggestTestUtils.jsm | 1 -
.../experimentalAPIs/actors/tabExtrasActor.jsm | 2 --
.../extensions/webcompat/about-compat/AboutCompat.jsm | 2 --
browser/modules/AboutNewTab.jsm | 1 -
browser/modules/AppUpdater.jsm | 1 -
browser/modules/AsyncTabSwitcher.jsm | 1 -
browser/modules/BrowserUsageTelemetry.jsm | 1 -
browser/modules/BrowserWindowTracker.jsm | 1 -
browser/modules/ContentCrashHandlers.jsm | 1 -
browser/modules/Discovery.jsm | 1 -
browser/modules/EveryWindow.jsm | 2 --
browser/modules/ExtensionsUI.jsm | 1 -
browser/modules/FaviconLoader.jsm | 2 --
browser/modules/HomePage.jsm | 1 -
browser/modules/LaterRun.jsm | 2 --
browser/modules/NewTabPagePreloading.jsm | 1 -
browser/modules/OpenInTabsUtils.jsm | 1 -
browser/modules/PageActions.jsm | 1 -
browser/modules/PartnerLinkAttribution.jsm | 1 -
browser/modules/PermissionUI.jsm | 1 -
browser/modules/PingCentre.jsm | 2 --
browser/modules/ProcessHangMonitor.jsm | 1 -
browser/modules/Sanitizer.jsm | 1 -
browser/modules/SiteDataManager.jsm | 1 -
browser/modules/SitePermissions.jsm | 1 -
browser/modules/TabUnloader.jsm | 2 --
browser/modules/WindowsJumpLists.jsm | 1 -
browser/modules/WindowsPreviewPerTab.jsm | 1 -
browser/modules/ZoomUI.jsm | 1 -
browser/modules/webrtcUI.jsm | 1 -
browser/themes/BuiltInThemeConfig.jsm | 1 -
browser/themes/BuiltInThemes.jsm | 1 -
browser/themes/ThemeVariableMap.jsm | 2 --
.../mozscreenshots/extension/Screenshot.jsm | 1 -
.../mozscreenshots/extension/TestRunner.jsm | 1 -
.../extension/configurations/AppMenu.jsm | 1 -
.../extension/configurations/Buttons.jsm | 1 -
.../extension/configurations/ControlCenter.jsm | 1 -
.../extension/configurations/CustomizeMode.jsm | 1 -
.../extension/configurations/DevTools.jsm | 1 -
.../extension/configurations/PermissionPrompts.jsm | 1 -
.../extension/configurations/Preferences.jsm | 1 -
.../mozscreenshots/extension/configurations/Tabs.jsm | 1 -
.../extension/configurations/TabsInTitlebar.jsm | 2 --
.../extension/configurations/Toolbars.jsm | 2 --
.../extension/configurations/UIDensities.jsm | 2 --
.../extension/configurations/WindowSize.jsm | 1 -
.../server/actors/targets/target-actor-registry.jsm | 2 --
devtools/server/actors/watcher/WatcherRegistry.jsm | 1 -
.../server/actors/watcher/browsing-context-helpers.jsm | 10 ----------
.../connectors/js-window-actor/DevToolsFrameChild.jsm | 1 -
.../connectors/js-window-actor/DevToolsWorkerChild.jsm | 1 -
devtools/shared/loader/Loader.jsm | 1 -
devtools/shared/security/DevToolsSocketStatus.jsm | 2 --
devtools/startup/AboutDebuggingRegistration.jsm | 1 -
devtools/startup/AboutDevToolsToolboxRegistration.jsm | 2 --
devtools/startup/DevToolsShim.jsm | 2 --
devtools/startup/DevToolsStartup.jsm | 1 -
docshell/base/URIFixup.jsm | 1 -
dom/base/ContentAreaDropListener.jsm | 2 --
dom/base/DOMRequestHelper.jsm | 2 --
dom/base/IndexedDBHelper.jsm | 2 --
dom/bindings/test/TestInterfaceJS.jsm | 2 --
dom/browser-element/BrowserElementParent.jsm | 1 -
dom/browser-element/BrowserElementPromptService.jsm | 2 --
dom/console/ConsoleAPIStorage.jsm | 2 --
dom/ipc/tests/JSProcessActor/browser_sendQuery.js | 4 ++--
dom/ipc/tests/JSWindowActor/browser_sendQuery.js | 4 ++--
dom/manifest/ImageObjectProcessor.jsm | 2 --
dom/manifest/ManifestObtainer.jsm | 2 --
dom/manifest/ManifestProcessor.jsm | 1 -
dom/media/IdpSandbox.jsm | 1 -
dom/media/PeerConnection.jsm | 1 -
dom/media/webvtt/vtt.jsm | 1 -
dom/notification/NotificationStorage.jsm | 2 --
dom/notification/new/NotificationDB.jsm | 1 -
dom/notification/old/NotificationDB.jsm | 2 --
dom/push/Push.jsm | 1 -
dom/push/PushComponents.jsm | 1 -
dom/push/PushCrypto.jsm | 1 -
dom/push/PushRecord.jsm | 1 -
dom/push/PushService.jsm | 1 -
dom/push/PushServiceAndroidGCM.jsm | 1 -
dom/push/PushServiceHttp2.jsm | 1 -
dom/push/PushServiceWebSocket.jsm | 1 -
dom/quota/test/modules/system/ModuleLoader.jsm | 2 --
dom/quota/test/modules/system/StorageUtils.jsm | 2 --
dom/system/NetworkGeolocationProvider.jsm | 1 -
extensions/permissions/test/PermissionTestUtils.jsm | 2 --
intl/locale/LangPackMatcher.jsm | 1 -
intl/locale/PluralForm.jsm | 2 --
js/xpconnect/loader/XPCOMUtils.jsm | 4 ----
js/xpconnect/tests/unit/environment_loadscript.jsm | 2 --
layout/tools/layout-debug/LayoutDebugChild.jsm | 2 --
layout/tools/reftest/manifest.jsm | 1 -
layout/tools/reftest/reftest.jsm | 1 -
mobile/android/actors/ContentDelegateChild.jsm | 2 --
mobile/android/actors/GeckoViewAutoFillChild.jsm | 1 -
mobile/android/actors/GeckoViewAutoFillParent.jsm | 1 -
mobile/android/actors/GeckoViewContentChild.jsm | 2 --
mobile/android/actors/GeckoViewPermissionChild.jsm | 1 -
mobile/android/actors/GeckoViewPermissionParent.jsm | 1 -
.../android/actors/GeckoViewPermissionProcessChild.jsm | 1 -
.../actors/GeckoViewPermissionProcessParent.jsm | 1 -
mobile/android/actors/GeckoViewPromptChild.jsm | 2 --
mobile/android/actors/GeckoViewPrompterParent.jsm | 2 --
mobile/android/actors/GeckoViewSettingsChild.jsm | 2 --
mobile/android/actors/LoadURIDelegateChild.jsm | 1 -
mobile/android/actors/ProgressDelegateChild.jsm | 2 --
mobile/android/actors/ScrollDelegateChild.jsm | 2 --
mobile/android/actors/SelectionActionDelegateChild.jsm | 1 -
.../android/actors/SelectionActionDelegateParent.jsm | 1 -
.../components/geckoview/FilePickerDelegate.jsm | 1 -
.../components/geckoview/GeckoViewPermission.jsm | 1 -
.../android/components/geckoview/GeckoViewPrompt.jsm | 1 -
.../android/components/geckoview/GeckoViewPrompter.jsm | 1 -
.../android/components/geckoview/GeckoViewStartup.jsm | 1 -
.../components/geckoview/LoginStorageDelegate.jsm | 1 -
mobile/android/components/geckoview/ShareDelegate.jsm | 1 -
.../web_extensions/test-support/TestSupportChild.jsm | 2 --
.../test-support/TestSupportProcessChild.jsm | 2 --
mobile/android/modules/geckoview/ChildCrashHandler.jsm | 1 -
mobile/android/modules/geckoview/GeckoViewConsole.jsm | 1 -
mobile/android/modules/geckoview/GeckoViewContent.jsm | 1 -
.../android/modules/geckoview/GeckoViewNavigation.jsm | 1 -
.../modules/geckoview/GeckoViewProcessHangMonitor.jsm | 2 --
mobile/android/modules/geckoview/GeckoViewProgress.jsm | 1 -
.../modules/geckoview/GeckoViewPushController.jsm | 1 -
.../modules/geckoview/GeckoViewRemoteDebugger.jsm | 1 -
.../modules/geckoview/GeckoViewSelectionAction.jsm | 1 -
mobile/android/modules/geckoview/GeckoViewSettings.jsm | 1 -
.../modules/geckoview/GeckoViewStorageController.jsm | 1 -
mobile/android/modules/geckoview/GeckoViewTab.jsm | 1 -
mobile/android/modules/geckoview/GeckoViewUtils.jsm | 1 -
.../modules/geckoview/GeckoViewWebExtension.jsm | 1 -
mobile/android/modules/geckoview/LoadURIDelegate.jsm | 1 -
mobile/android/modules/geckoview/Messaging.jsm | 1 -
mobile/android/modules/test/AppUiTestDelegate.jsm | 1 -
netwerk/base/NetUtil.jsm | 2 --
netwerk/dns/PublicSuffixList.jsm | 1 -
.../test/browser/early_hint_preload_test_helper.jsm | 1 -
.../UrlClassifierExceptionListService.jsm | 2 --
remote/cdp/CDPConnection.jsm | 1 -
remote/cdp/Error.jsm | 1 -
remote/cdp/JSONHandler.jsm | 1 -
remote/cdp/StreamRegistry.jsm | 1 -
remote/cdp/domains/content/Log.jsm | 2 --
remote/cdp/domains/content/Page.jsm | 2 --
remote/cdp/domains/content/Runtime.jsm | 1 -
.../cdp/domains/content/runtime/ExecutionContext.jsm | 2 --
remote/cdp/domains/parent/Browser.jsm | 2 --
remote/cdp/domains/parent/Input.jsm | 2 --
remote/cdp/domains/parent/Network.jsm | 2 --
remote/cdp/domains/parent/Page.jsm | 1 -
remote/cdp/domains/parent/Target.jsm | 1 -
remote/cdp/domains/parent/page/DialogHandler.jsm | 1 -
remote/cdp/observers/ChannelEventSink.jsm | 1 -
remote/cdp/observers/ContextObserver.jsm | 1 -
remote/cdp/observers/NetworkObserver.jsm | 1 -
remote/cdp/observers/TargetObserver.jsm | 1 -
remote/cdp/targets/TabTarget.jsm | 1 -
remote/cdp/targets/Target.jsm | 1 -
remote/components/Marionette.jsm | 1 -
remote/components/RemoteAgent.jsm | 1 -
remote/marionette/actors/MarionetteCommandsChild.jsm | 1 -
remote/marionette/actors/MarionetteEventsChild.jsm | 1 -
remote/marionette/actors/MarionetteEventsParent.jsm | 1 -
remote/server/WebSocketHandshake.jsm | 1 -
remote/shared/Format.jsm | 1 -
remote/shared/Log.jsm | 1 -
remote/shared/RecommendedPreferences.jsm | 1 -
remote/shared/Sync.jsm | 1 -
remote/shared/TabManager.jsm | 1 -
remote/shared/WebSocketConnection.jsm | 1 -
remote/shared/WindowManager.jsm | 1 -
remote/shared/listeners/BrowsingContextListener.jsm | 1 -
remote/shared/listeners/ConsoleListener.jsm | 1 -
remote/shared/messagehandler/ModuleCache.jsm | 1 -
.../shared/messagehandler/sessiondata/SessionData.jsm | 1 -
.../messagehandler/sessiondata/SessionDataReader.jsm | 1 -
.../messagehandler/transports/FrameTransport.jsm | 1 -
remote/shared/webdriver/Capabilities.jsm | 1 -
remote/shared/webdriver/Session.jsm | 1 -
remote/webdriver-bidi/modules/root/browsingContext.jsm | 1 -
security/manager/ssl/RemoteSecuritySettings.jsm | 1 -
services/automation/ServicesAutomation.jsm | 1 -
services/fxaccounts/Credentials.jsm | 1 -
services/fxaccounts/FxAccounts.jsm | 1 -
services/fxaccounts/FxAccountsClient.jsm | 1 -
services/fxaccounts/FxAccountsConfig.jsm | 1 -
services/fxaccounts/FxAccountsDevice.jsm | 2 --
services/fxaccounts/FxAccountsPairing.jsm | 1 -
services/fxaccounts/FxAccountsProfile.jsm | 1 -
services/fxaccounts/FxAccountsPush.jsm | 1 -
services/fxaccounts/FxAccountsStorage.jsm | 1 -
services/fxaccounts/FxAccountsTelemetry.jsm | 1 -
services/fxaccounts/FxAccountsWebChannel.jsm | 1 -
services/settings/Database.jsm | 1 -
services/settings/RemoteSettingsClient.jsm | 1 -
services/settings/Utils.jsm | 1 -
services/sync/Weave.jsm | 1 -
services/sync/modules/SyncDisconnect.jsm | 1 -
services/sync/modules/SyncedTabs.jsm | 1 -
services/sync/modules/UIState.jsm | 1 -
.../tps/extensions/tps/resource/auth/fxaccounts.jsm | 1 -
services/sync/tps/extensions/tps/resource/logger.jsm | 1 -
.../tps/extensions/tps/resource/modules/bookmarks.jsm | 1 -
.../tps/extensions/tps/resource/modules/passwords.jsm | 1 -
.../sync/tps/extensions/tps/resource/modules/prefs.jsm | 1 -
.../sync/tps/extensions/tps/resource/modules/tabs.jsm | 1 -
.../tps/extensions/tps/resource/modules/windows.jsm | 2 --
services/sync/tps/extensions/tps/resource/tps.jsm | 1 -
storage/test/unit/VacuumParticipant.jsm | 2 --
.../mochitest/BrowserTestUtils/BrowserTestUtils.jsm | 1 -
.../BrowserTestUtils/BrowserTestUtilsChild.jsm | 1 -
.../BrowserTestUtils/ContentEventListenerChild.jsm | 2 --
testing/mochitest/BrowserTestUtils/ContentTask.jsm | 2 --
.../mochitest/BrowserTestUtils/ContentTaskUtils.jsm | 1 -
testing/mochitest/ShutdownLeaksCollector.jsm | 1 -
testing/modules/AppData.jsm | 1 -
testing/modules/AppInfo.jsm | 2 --
testing/modules/MockRegistrar.jsm | 1 -
testing/modules/MockRegistry.jsm | 2 --
testing/modules/Sinon.jsm | 2 --
testing/modules/TestUtils.jsm | 1 -
testing/modules/XPCShellContentUtils.jsm | 4 ----
.../specialpowers/content/AppTestDelegateParent.jsm | 1 -
testing/specialpowers/content/MockColorPicker.jsm | 1 -
testing/specialpowers/content/MockFilePicker.jsm | 1 -
testing/specialpowers/content/MockPermissionPrompt.jsm | 2 --
testing/specialpowers/content/SpecialPowersChild.jsm | 2 --
.../specialpowers/content/SpecialPowersEventUtils.jsm | 2 --
testing/specialpowers/content/SpecialPowersParent.jsm | 1 -
.../talos/talos-powers/content/TalosParentProfiler.jsm | 2 --
toolkit/actors/AboutHttpsOnlyErrorChild.jsm | 1 -
toolkit/actors/AboutHttpsOnlyErrorParent.jsm | 1 -
toolkit/actors/AutoCompleteChild.jsm | 2 --
toolkit/actors/AutoCompleteParent.jsm | 2 --
toolkit/actors/AutoScrollChild.jsm | 2 --
toolkit/actors/AutoScrollParent.jsm | 2 --
toolkit/actors/BackgroundThumbnailsChild.jsm | 1 -
toolkit/actors/ContentMetaChild.jsm | 2 --
toolkit/actors/DateTimePickerChild.jsm | 1 -
toolkit/actors/DateTimePickerParent.jsm | 1 -
toolkit/actors/FindBarChild.jsm | 1 -
toolkit/actors/KeyPressEventModelCheckerChild.jsm | 1 -
toolkit/actors/PictureInPictureChild.jsm | 1 -
toolkit/actors/PrintingChild.jsm | 2 --
toolkit/actors/RemotePageChild.jsm | 1 -
toolkit/actors/TestProcessActorChild.jsm | 2 --
toolkit/actors/TestWindowChild.jsm | 2 --
toolkit/actors/TestWindowParent.jsm | 2 --
toolkit/actors/ThumbnailsChild.jsm | 1 -
toolkit/actors/UAWidgetsChild.jsm | 2 --
toolkit/actors/UnselectedTabHoverChild.jsm | 2 --
toolkit/actors/ViewSourceChild.jsm | 2 --
toolkit/actors/ViewSourcePageChild.jsm | 1 -
toolkit/actors/ViewSourcePageParent.jsm | 2 --
toolkit/actors/WebChannelChild.jsm | 1 -
toolkit/components/DefaultCLH.jsm | 2 --
.../antitracking/ContentBlockingAllowList.jsm | 2 --
.../antitracking/PartitioningExceptionListService.jsm | 2 --
.../components/antitracking/PurgeTrackerService.jsm | 1 -
toolkit/components/antitracking/TrackingDBService.jsm | 1 -
.../antitracking/URLDecorationAnnotationsService.jsm | 2 --
.../antitracking/URLQueryStrippingListService.jsm | 1 -
toolkit/components/asyncshutdown/AsyncShutdown.jsm | 1 -
.../backgroundhangmonitor/BHRTelemetryService.jsm | 2 --
.../backgroundtasks/BackgroundTasksManager.jsm | 1 -
.../backgroundtasks/BackgroundTasksTestUtils.jsm | 1 -
.../backgroundtasks/BackgroundTasksUtils.jsm | 1 -
.../BackgroundTask_backgroundtask_specific_pref.jsm | 2 --
.../backgroundtasks/tests/BackgroundTask_crash.jsm | 2 --
.../tests/BackgroundTask_unique_profile.jsm | 1 -
toolkit/components/captivedetect/CaptiveDetect.jsm | 2 --
toolkit/components/cleardata/ClearDataService.jsm | 1 -
toolkit/components/cleardata/PrincipalsCollector.jsm | 2 --
toolkit/components/cleardata/ServiceWorkerCleanUp.jsm | 1 -
toolkit/components/cleardata/SiteDataTestUtils.jsm | 1 -
.../components/contentprefs/ContentPrefService2.jsm | 1 -
.../contentprefs/ContentPrefServiceChild.jsm | 2 --
.../contentprefs/tests/unit_cps2/AsyncRunner.jsm | 2 --
.../contextualidentity/ContextualIdentityService.jsm | 1 -
toolkit/components/crashes/CrashManager.in.jsm | 1 -
toolkit/components/crashes/CrashManagerTest.jsm | 1 -
toolkit/components/crashes/CrashService.jsm | 1 -
toolkit/components/crashmonitor/CrashMonitor.jsm | 1 -
toolkit/components/downloads/DownloadCore.jsm | 1 -
toolkit/components/downloads/DownloadHistory.jsm | 1 -
toolkit/components/downloads/DownloadIntegration.jsm | 1 -
toolkit/components/downloads/DownloadLegacy.jsm | 2 --
toolkit/components/downloads/DownloadList.jsm | 2 --
toolkit/components/downloads/DownloadUIHelper.jsm | 1 -
.../enterprisepolicies/EnterprisePoliciesContent.jsm | 2 --
.../enterprisepolicies/EnterprisePoliciesParent.jsm | 1 -
.../components/enterprisepolicies/WindowsGPOParser.jsm | 1 -
.../tests/EnterprisePolicyTesting.jsm | 1 -
toolkit/components/extensions/Extension.jsm | 1 -
toolkit/components/extensions/ExtensionActivityLog.jsm | 1 -
toolkit/components/extensions/ExtensionChild.jsm | 1 -
.../extensions/ExtensionChildDevToolsUtils.jsm | 1 -
toolkit/components/extensions/ExtensionCommon.jsm | 1 -
toolkit/components/extensions/ExtensionContent.jsm | 1 -
toolkit/components/extensions/ExtensionPageChild.jsm | 2 --
toolkit/components/extensions/ExtensionParent.jsm | 1 -
toolkit/components/extensions/ExtensionPermissions.jsm | 1 -
.../extensions/ExtensionPreferencesManager.jsm | 2 --
.../components/extensions/ExtensionProcessScript.jsm | 1 -
.../components/extensions/ExtensionSettingsStore.jsm | 1 -
toolkit/components/extensions/ExtensionStorage.jsm | 1 -
toolkit/components/extensions/ExtensionStorageIDB.jsm | 1 -
.../extensions/ExtensionStorageSyncKinto.jsm | 1 -
toolkit/components/extensions/ExtensionTelemetry.jsm | 2 --
toolkit/components/extensions/ExtensionTestCommon.jsm | 1 -
toolkit/components/extensions/ExtensionUtils.jsm | 1 -
toolkit/components/extensions/ExtensionWorkerChild.jsm | 2 --
.../components/extensions/ExtensionXPCShellUtils.jsm | 1 -
toolkit/components/extensions/MatchURLFilters.jsm | 2 --
toolkit/components/extensions/MessageChannel.jsm | 1 -
toolkit/components/extensions/MessageManagerProxy.jsm | 1 -
toolkit/components/extensions/NativeManifests.jsm | 1 -
toolkit/components/extensions/NativeMessaging.jsm | 1 -
toolkit/components/extensions/PerformanceCounters.jsm | 1 -
toolkit/components/extensions/Schemas.jsm | 1 -
toolkit/components/extensions/WebNavigation.jsm | 1 -
.../components/extensions/webrequest/WebRequest.jsm | 1 -
.../featuregates/FeatureGateImplementation.jsm | 1 -
toolkit/components/forgetaboutsite/ForgetAboutSite.jsm | 2 --
toolkit/components/formautofill/FormAutofill.jsm | 1 -
toolkit/components/formautofill/FormAutofillChild.jsm | 2 --
.../components/formautofill/FormAutofillContent.jsm | 1 -
.../components/formautofill/FormAutofillHandler.jsm | 2 --
.../components/formautofill/FormAutofillHeuristics.jsm | 1 -
toolkit/components/formautofill/FormAutofillParent.jsm | 1 -
.../formautofill/FormAutofillPreferences.jsm | 1 -
.../formautofill/FormAutofillStorageBase.jsm | 1 -
toolkit/components/formautofill/FormAutofillSync.jsm | 1 -
.../formautofill/FormAutofillTelemetryUtils.jsm | 1 -
toolkit/components/formautofill/FormAutofillUtils.jsm | 1 -
.../formautofill/default/FormAutofillPrompter.jsm | 1 -
toolkit/components/gfx/SanityTest.jsm | 2 --
toolkit/components/messaging-system/lib/Logger.jsm | 1 -
.../messaging-system/lib/SpecialMessageActions.jsm | 1 -
.../messaging-system/targeting/Targeting.jsm | 1 -
toolkit/components/mozintl/mozIntl.jsm | 2 --
toolkit/components/mozprotocol/MozProtocolHandler.jsm | 1 -
toolkit/components/narrate/NarrateControls.jsm | 1 -
toolkit/components/narrate/Narrator.jsm | 2 --
toolkit/components/narrate/test/NarrateTestUtils.jsm | 1 -
toolkit/components/nimbus/ExperimentAPI.jsm | 1 -
toolkit/components/nimbus/lib/ExperimentManager.jsm | 1 -
toolkit/components/nimbus/lib/ExperimentStore.jsm | 1 -
.../nimbus/lib/RemoteSettingsExperimentLoader.jsm | 1 -
toolkit/components/nimbus/lib/SharedDataMap.jsm | 1 -
toolkit/components/nimbus/test/NimbusTestUtils.jsm | 2 --
toolkit/components/normandy/Normandy.jsm | 1 -
toolkit/components/normandy/NormandyMigrations.jsm | 1 -
.../components/normandy/actions/AddonRolloutAction.jsm | 1 -
.../components/normandy/actions/BaseStudyAction.jsm | 1 -
.../normandy/actions/BranchedAddonStudyAction.jsm | 1 -
.../normandy/actions/PreferenceRolloutAction.jsm | 1 -
.../normandy/actions/ShowHeartbeatAction.jsm | 1 -
toolkit/components/normandy/content/AboutPages.jsm | 1 -
.../components/normandy/content/ShieldFrameChild.jsm | 1 -
toolkit/components/normandy/lib/AddonStudies.jsm | 1 -
toolkit/components/normandy/lib/ClientEnvironment.jsm | 1 -
toolkit/components/normandy/lib/Heartbeat.jsm | 1 -
toolkit/components/normandy/lib/NormandyApi.jsm | 2 --
toolkit/components/normandy/lib/NormandyUtils.jsm | 2 --
toolkit/components/normandy/lib/PrefUtils.jsm | 1 -
.../components/normandy/lib/PreferenceExperiments.jsm | 1 -
toolkit/components/normandy/lib/PreferenceRollouts.jsm | 1 -
toolkit/components/normandy/lib/RecipeRunner.jsm | 1 -
toolkit/components/normandy/lib/ShieldPreferences.jsm | 1 -
toolkit/components/normandy/lib/TelemetryEvents.jsm | 2 --
toolkit/components/normandy/lib/Uptake.jsm | 1 -
toolkit/components/normandy/test/NormandyTestUtils.jsm | 1 -
.../components/osfile/modules/osfile_async_front.jsm | 1 -
.../osfile/modules/osfile_shared_allthreads.jsm | 5 -----
.../components/passwordmgr/InsecurePasswordUtils.jsm | 1 -
toolkit/components/passwordmgr/LoginAutoComplete.jsm | 1 -
toolkit/components/passwordmgr/LoginCSVImport.jsm | 1 -
toolkit/components/passwordmgr/LoginExport.jsm | 1 -
toolkit/components/passwordmgr/LoginHelper.jsm | 1 -
toolkit/components/passwordmgr/LoginInfo.jsm | 2 --
toolkit/components/passwordmgr/LoginManager.jsm | 1 -
.../passwordmgr/LoginManagerAuthPrompter.jsm | 1 -
toolkit/components/passwordmgr/LoginManagerChild.jsm | 1 -
.../components/passwordmgr/LoginManagerContextMenu.jsm | 1 -
toolkit/components/passwordmgr/LoginManagerParent.jsm | 1 -
.../components/passwordmgr/LoginManagerPrompter.jsm | 1 -
toolkit/components/passwordmgr/LoginRecipes.jsm | 1 -
toolkit/components/passwordmgr/LoginRelatedRealms.jsm | 1 -
toolkit/components/passwordmgr/LoginStore.jsm | 1 -
.../components/passwordmgr/PasswordRulesManager.jsm | 1 -
toolkit/components/passwordmgr/test/LoginTestUtils.jsm | 2 --
toolkit/components/pdfjs/content/PdfJs.jsm | 1 -
toolkit/components/pdfjs/content/PdfJsNetwork.jsm | 2 --
toolkit/components/pdfjs/content/PdfJsTelemetry.jsm | 2 --
toolkit/components/pdfjs/content/PdfSandbox.jsm | 1 -
.../components/pdfjs/content/PdfStreamConverter.jsm | 1 -
toolkit/components/pdfjs/content/PdfjsParent.jsm | 2 --
.../components/pictureinpicture/PictureInPicture.jsm | 1 -
toolkit/components/places/BookmarkHTMLUtils.jsm | 1 -
toolkit/components/places/BookmarkJSONUtils.jsm | 1 -
toolkit/components/places/History.jsm | 1 -
toolkit/components/places/PlacesBackups.jsm | 1 -
toolkit/components/places/PlacesDBUtils.jsm | 1 -
toolkit/components/places/PlacesExpiration.jsm | 1 -
toolkit/components/places/PlacesPreviews.jsm | 1 -
toolkit/components/places/PlacesSyncUtils.jsm | 1 -
toolkit/components/places/PlacesTransactions.jsm | 1 -
toolkit/components/places/PlacesUtils.jsm | 1 -
toolkit/components/places/TaggingService.jsm | 1 -
toolkit/components/places/tests/PlacesTestUtils.jsm | 1 -
.../processsingleton/CustomElementsListener.jsm | 2 --
.../processsingleton/MainProcessSingleton.jsm | 2 --
toolkit/components/prompts/content/tabprompts.jsm | 1 -
toolkit/components/prompts/src/CommonDialog.jsm | 1 -
toolkit/components/prompts/src/Prompter.jsm | 1 -
toolkit/components/prompts/src/SharedPromptUtils.jsm | 2 --
toolkit/components/prompts/test/PromptTestUtils.jsm | 1 -
toolkit/components/reader/AboutReader.jsm | 1 -
toolkit/components/reader/ReaderMode.jsm | 1 -
.../remotebrowserutils/RemoteWebNavigation.jsm | 1 -
.../remotepagemanager/RemotePageManagerChild.jsm | 1 -
.../remotepagemanager/RemotePageManagerParent.jsm | 1 -
toolkit/components/resistfingerprinting/RFPHelper.jsm | 1 -
toolkit/components/satchel/FormAutoComplete.jsm | 2 --
toolkit/components/satchel/FormHistory.jsm | 1 -
toolkit/components/satchel/FormHistoryChild.jsm | 1 -
toolkit/components/satchel/FormHistoryStartup.jsm | 2 --
toolkit/components/search/OpenSearchEngine.jsm | 1 -
toolkit/components/search/SearchEngine.jsm | 1 -
toolkit/components/search/SearchEngineSelector.jsm | 1 -
toolkit/components/search/SearchService.jsm | 1 -
toolkit/components/search/SearchSettings.jsm | 1 -
.../components/search/SearchSuggestionController.jsm | 1 -
toolkit/components/search/SearchSuggestions.jsm | 1 -
toolkit/components/search/SearchUtils.jsm | 1 -
toolkit/components/search/tests/SearchTestUtils.jsm | 1 -
.../taskscheduler/TaskSchedulerMacOSImpl.jsm | 1 -
.../components/taskscheduler/TaskSchedulerWinImpl.jsm | 1 -
toolkit/components/telemetry/app/ClientID.jsm | 1 -
.../telemetry/app/TelemetryControllerBase.jsm | 1 -
.../telemetry/app/TelemetryControllerContent.jsm | 1 -
.../telemetry/app/TelemetryControllerParent.jsm | 1 -
.../components/telemetry/app/TelemetryEnvironment.jsm | 1 -
.../telemetry/app/TelemetryReportingPolicy.jsm | 1 -
.../components/telemetry/app/TelemetryScheduler.jsm | 1 -
toolkit/components/telemetry/app/TelemetrySend.jsm | 1 -
toolkit/components/telemetry/app/TelemetryStorage.jsm | 1 -
toolkit/components/telemetry/app/TelemetryUtils.jsm | 1 -
toolkit/components/telemetry/pings/CoveragePing.jsm | 1 -
toolkit/components/telemetry/pings/EventPing.jsm | 1 -
toolkit/components/telemetry/pings/HealthPing.jsm | 1 -
toolkit/components/telemetry/pings/ModulesPing.jsm | 1 -
toolkit/components/telemetry/pings/PrioPing.jsm | 1 -
.../components/telemetry/pings/TelemetrySession.jsm | 1 -
toolkit/components/telemetry/pings/UninstallPing.jsm | 1 -
.../telemetry/pings/UntrustedModulesPing.jsm | 1 -
toolkit/components/telemetry/pings/UpdatePing.jsm | 1 -
.../telemetry/tests/unit/TelemetryArchiveTesting.jsm | 1 -
.../tests/unit/TelemetryEnvironmentTesting.jsm | 1 -
.../telemetry/tests/utils/TelemetryTestUtils.jsm | 1 -
toolkit/components/terminator/TerminatorTelemetry.jsm | 1 -
toolkit/components/thumbnails/BackgroundPageThumbs.jsm | 1 -
toolkit/components/thumbnails/PageThumbUtils.jsm | 2 --
toolkit/components/thumbnails/PageThumbs.jsm | 1 -
toolkit/components/timermanager/UpdateTimerManager.jsm | 1 -
toolkit/components/tooltiptext/TooltipTextProvider.jsm | 2 --
toolkit/components/url-classifier/SafeBrowsing.jsm | 2 --
.../url-classifier/UrlClassifierHashCompleter.jsm | 1 -
toolkit/components/url-classifier/UrlClassifierLib.jsm | 2 --
.../url-classifier/UrlClassifierListManager.jsm | 1 -
.../url-classifier/tests/UrlClassifierTestUtils.jsm | 2 --
toolkit/components/urlformatter/URLFormatter.jsm | 1 -
toolkit/components/utils/ClientEnvironment.jsm | 1 -
toolkit/components/utils/FilterExpressions.jsm | 1 -
toolkit/components/utils/WindowsInstallsInfo.jsm | 2 --
toolkit/components/xulstore/old/XULStore.jsm | 2 --
toolkit/crashreporter/CrashReports.jsm | 2 --
toolkit/crashreporter/CrashSubmit.jsm | 1 -
toolkit/crashreporter/test/CrashTestUtils.jsm | 1 -
toolkit/modules/AboutPagesUtils.jsm | 1 -
toolkit/modules/ActorManagerParent.jsm | 1 -
toolkit/modules/AppConstants.jsm | 3 ---
toolkit/modules/AppMenuNotifications.jsm | 2 --
toolkit/modules/AsanReporter.jsm | 1 -
toolkit/modules/AsyncPrefs.jsm | 2 --
toolkit/modules/BrowserTelemetryUtils.jsm | 1 -
toolkit/modules/BrowserUtils.jsm | 1 -
toolkit/modules/CertUtils.jsm | 2 --
toolkit/modules/Console.jsm | 2 --
toolkit/modules/ContentDOMReference.jsm | 3 ---
toolkit/modules/DateTimePickerPanel.jsm | 2 --
toolkit/modules/Deprecated.jsm | 2 --
toolkit/modules/E10SUtils.jsm | 1 -
toolkit/modules/EventEmitter.jsm | 2 --
toolkit/modules/FileUtils.jsm | 2 --
toolkit/modules/FindBarContent.jsm | 2 --
toolkit/modules/Finder.jsm | 1 -
toolkit/modules/FinderHighlighter.jsm | 1 -
toolkit/modules/FinderIterator.jsm | 1 -
toolkit/modules/FinderParent.jsm | 1 -
toolkit/modules/FirstStartup.jsm | 1 -
toolkit/modules/GMPInstallManager.jsm | 1 -
toolkit/modules/GMPUtils.jsm | 1 -
toolkit/modules/HiddenFrame.jsm | 1 -
toolkit/modules/InlineSpellChecker.jsm | 2 --
toolkit/modules/JSONFile.jsm | 2 --
toolkit/modules/JsonSchema.jsm | 2 --
toolkit/modules/LightweightThemeConsumer.jsm | 2 --
toolkit/modules/Log.jsm | 1 -
toolkit/modules/NewTabUtils.jsm | 1 -
toolkit/modules/OSKeyStore.jsm | 1 -
toolkit/modules/OsEnvironment.jsm | 1 -
toolkit/modules/PermissionsUtils.jsm | 2 --
toolkit/modules/PopupNotifications.jsm | 1 -
toolkit/modules/Preferences.jsm | 2 --
toolkit/modules/PrivateBrowsingUtils.jsm | 2 --
toolkit/modules/ProfileAge.jsm | 1 -
toolkit/modules/PromiseUtils.jsm | 2 --
toolkit/modules/PropertyListUtils.jsm | 1 -
toolkit/modules/Region.jsm | 1 -
toolkit/modules/ResetProfile.jsm | 1 -
toolkit/modules/SelectionUtils.jsm | 2 --
toolkit/modules/ServiceRequest.jsm | 1 -
toolkit/modules/ShortcutUtils.jsm | 1 -
toolkit/modules/Sqlite.jsm | 1 -
toolkit/modules/SubDialog.jsm | 2 --
toolkit/modules/Troubleshoot.jsm | 1 -
toolkit/modules/UpdateUtils.jsm | 1 -
toolkit/modules/WebChannel.jsm | 2 --
toolkit/modules/sessionstore/PrivacyLevel.jsm | 2 --
toolkit/modules/sessionstore/SessionHistory.jsm | 2 --
toolkit/modules/subprocess/subprocess_common.jsm | 2 --
toolkit/modules/subprocess/subprocess_unix.jsm | 1 -
toolkit/modules/subprocess/subprocess_win.jsm | 1 -
toolkit/modules/tests/modules/MockDocument.jsm | 1 -
toolkit/modules/tests/modules/OSKeyStoreTestUtils.jsm | 1 -
toolkit/modules/tests/modules/PromiseTestUtils.jsm | 1 -
toolkit/modules/tests/xpcshell/RegionTestUtils.jsm | 2 --
toolkit/mozapps/downloads/DownloadLastDir.jsm | 1 -
toolkit/mozapps/downloads/DownloadUtils.jsm | 2 --
toolkit/mozapps/downloads/HelperAppDlg.jsm | 1 -
toolkit/mozapps/extensions/AbuseReporter.jsm | 1 -
toolkit/mozapps/extensions/AddonManager.jsm | 1 -
toolkit/mozapps/extensions/Blocklist.jsm | 1 -
toolkit/mozapps/extensions/amContentHandler.jsm | 1 -
toolkit/mozapps/extensions/amInstallTrigger.jsm | 1 -
toolkit/mozapps/extensions/amWebAPI.jsm | 1 -
.../mozapps/extensions/internal/AddonRepository.jsm | 1 -
toolkit/mozapps/extensions/internal/AddonTestUtils.jsm | 1 -
.../mozapps/extensions/internal/AddonUpdateChecker.jsm | 2 --
toolkit/mozapps/extensions/internal/GMPProvider.jsm | 1 -
toolkit/mozapps/extensions/internal/XPIDatabase.jsm | 1 -
toolkit/mozapps/extensions/internal/XPIInstall.jsm | 1 -
toolkit/mozapps/extensions/internal/XPIProvider.jsm | 1 -
toolkit/mozapps/handling/ContentDispatchChooser.jsm | 1 -
.../mozapps/update/BackgroundTask_backgroundupdate.jsm | 1 -
toolkit/mozapps/update/BackgroundUpdate.jsm | 1 -
toolkit/mozapps/update/UpdateListener.jsm | 1 -
toolkit/mozapps/update/UpdateService.jsm | 1 -
toolkit/mozapps/update/UpdateServiceStub.jsm | 1 -
toolkit/mozapps/update/UpdateTelemetry.jsm | 1 -
tools/code-coverage/PerTestCoverageUtils.jsm | 2 --
uriloader/exthandler/ExtHandlerService.jsm | 1 -
uriloader/exthandler/WebHandlerApp.jsm | 2 --
uriloader/exthandler/tests/HandlerServiceTestUtils.jsm | 2 --
740 files changed, 7 insertions(+), 944 deletions(-)
diff --git a/accessible/tests/browser/Common.jsm b/accessible/tests/browser/Common.jsm
index 527e301be941d..1f8c3dcbc0260 100644
--- a/accessible/tests/browser/Common.jsm
+++ b/accessible/tests/browser/Common.jsm
@@ -6,7 +6,6 @@
const EXPORTED_SYMBOLS = ["CommonUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { Assert } = ChromeUtils.import("resource://testing-common/Assert.jsm");
const MAX_TRIM_LENGTH = 100;
diff --git a/browser/actors/AboutNewTabChild.jsm b/browser/actors/AboutNewTabChild.jsm
index 0dcd9353e56df..ef8ff2a83e176 100644
--- a/browser/actors/AboutNewTabChild.jsm
+++ b/browser/actors/AboutNewTabChild.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["AboutNewTabChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/actors/AboutPrivateBrowsingChild.jsm b/browser/actors/AboutPrivateBrowsingChild.jsm
index 3877039d52585..16498fc080d69 100644
--- a/browser/actors/AboutPrivateBrowsingChild.jsm
+++ b/browser/actors/AboutPrivateBrowsingChild.jsm
@@ -13,8 +13,6 @@ const { RemotePageChild } = ChromeUtils.import(
"resource://gre/actors/RemotePageChild.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
diff --git a/browser/actors/AboutPrivateBrowsingParent.jsm b/browser/actors/AboutPrivateBrowsingParent.jsm
index 2d3cf9ca7dab8..ee6820f918ec1 100644
--- a/browser/actors/AboutPrivateBrowsingParent.jsm
+++ b/browser/actors/AboutPrivateBrowsingParent.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["AboutPrivateBrowsingParent"];
const { ASRouter } = ChromeUtils.import(
"resource://activity-stream/lib/ASRouter.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { BrowserUtils } = ChromeUtils.import(
"resource://gre/modules/BrowserUtils.jsm"
);
diff --git a/browser/actors/AboutProtectionsChild.jsm b/browser/actors/AboutProtectionsChild.jsm
index fd73dfe3ed0d2..a35cafa12589f 100644
--- a/browser/actors/AboutProtectionsChild.jsm
+++ b/browser/actors/AboutProtectionsChild.jsm
@@ -5,7 +5,6 @@
var EXPORTED_SYMBOLS = ["AboutProtectionsChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { RemotePageChild } = ChromeUtils.import(
"resource://gre/actors/RemotePageChild.jsm"
);
diff --git a/browser/actors/AboutProtectionsParent.jsm b/browser/actors/AboutProtectionsParent.jsm
index 948644efa5ea5..28bf64709f88d 100644
--- a/browser/actors/AboutProtectionsParent.jsm
+++ b/browser/actors/AboutProtectionsParent.jsm
@@ -8,7 +8,6 @@ var EXPORTED_SYMBOLS = ["AboutProtectionsParent"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/actors/AboutReaderParent.jsm b/browser/actors/AboutReaderParent.jsm
index d4ceb5511180c..ef982a7bc1c2c 100644
--- a/browser/actors/AboutReaderParent.jsm
+++ b/browser/actors/AboutReaderParent.jsm
@@ -7,8 +7,6 @@
var EXPORTED_SYMBOLS = ["AboutReaderParent"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/browser/actors/BlockedSiteChild.jsm b/browser/actors/BlockedSiteChild.jsm
index d50bbdcdeef61..d4e46f1671de7 100644
--- a/browser/actors/BlockedSiteChild.jsm
+++ b/browser/actors/BlockedSiteChild.jsm
@@ -3,8 +3,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var EXPORTED_SYMBOLS = ["BlockedSiteChild"];
const lazy = {};
diff --git a/browser/actors/BlockedSiteParent.jsm b/browser/actors/BlockedSiteParent.jsm
index 22664a2912b8c..b25223c405037 100644
--- a/browser/actors/BlockedSiteParent.jsm
+++ b/browser/actors/BlockedSiteParent.jsm
@@ -4,7 +4,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var EXPORTED_SYMBOLS = ["BlockedSiteParent"];
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
class BlockedSiteParent extends JSWindowActorParent {
receiveMessage(msg) {
diff --git a/browser/actors/BrowserTabChild.jsm b/browser/actors/BrowserTabChild.jsm
index 79c9c61d2da87..fa3e449da6b29 100644
--- a/browser/actors/BrowserTabChild.jsm
+++ b/browser/actors/BrowserTabChild.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["BrowserTabChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/browser/actors/ClickHandlerChild.jsm b/browser/actors/ClickHandlerChild.jsm
index 0c3240aeb5ac3..6f12423ad7be3 100644
--- a/browser/actors/ClickHandlerChild.jsm
+++ b/browser/actors/ClickHandlerChild.jsm
@@ -5,7 +5,6 @@
var EXPORTED_SYMBOLS = ["ClickHandlerChild", "MiddleMousePasteHandlerChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/actors/ContentSearchParent.jsm b/browser/actors/ContentSearchParent.jsm
index 2e923a3cd68ba..f23663cd65fa7 100644
--- a/browser/actors/ContentSearchParent.jsm
+++ b/browser/actors/ContentSearchParent.jsm
@@ -5,7 +5,6 @@
var EXPORTED_SYMBOLS = ["ContentSearchParent", "ContentSearch"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/actors/ContextMenuChild.jsm b/browser/actors/ContextMenuChild.jsm
index 2a53a2ae2a780..a00641c3663a3 100644
--- a/browser/actors/ContextMenuChild.jsm
+++ b/browser/actors/ContextMenuChild.jsm
@@ -8,7 +8,6 @@
var EXPORTED_SYMBOLS = ["ContextMenuChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/actors/DOMFullscreenChild.jsm b/browser/actors/DOMFullscreenChild.jsm
index b0f3769dfa578..b3c55ce2a58bf 100644
--- a/browser/actors/DOMFullscreenChild.jsm
+++ b/browser/actors/DOMFullscreenChild.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["DOMFullscreenChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
class DOMFullscreenChild extends JSWindowActorChild {
receiveMessage(aMessage) {
let window = this.contentWindow;
diff --git a/browser/actors/DOMFullscreenParent.jsm b/browser/actors/DOMFullscreenParent.jsm
index a6b94f113ee95..64a4f987a77ac 100644
--- a/browser/actors/DOMFullscreenParent.jsm
+++ b/browser/actors/DOMFullscreenParent.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["DOMFullscreenParent"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
class DOMFullscreenParent extends JSWindowActorParent {
// These properties get set by browser-fullScreenAndPointerLock.js.
// TODO: Bug 1743703 - Consider moving the messaging component of
diff --git a/browser/actors/DecoderDoctorParent.jsm b/browser/actors/DecoderDoctorParent.jsm
index fd40eb748d99c..b2ca472fed803 100644
--- a/browser/actors/DecoderDoctorParent.jsm
+++ b/browser/actors/DecoderDoctorParent.jsm
@@ -11,7 +11,6 @@ var EXPORTED_SYMBOLS = ["DecoderDoctorParent"];
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/actors/EncryptedMediaChild.jsm b/browser/actors/EncryptedMediaChild.jsm
index d700faf532337..f2cc9b2df8fc2 100644
--- a/browser/actors/EncryptedMediaChild.jsm
+++ b/browser/actors/EncryptedMediaChild.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["EncryptedMediaChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
/**
* GlobalCaptureListener is a class that listens for changes to the global
* capture state of windows and screens. It uses this information to notify
diff --git a/browser/actors/EncryptedMediaParent.jsm b/browser/actors/EncryptedMediaParent.jsm
index 623a510066aa7..a12968e9bbfe4 100644
--- a/browser/actors/EncryptedMediaParent.jsm
+++ b/browser/actors/EncryptedMediaParent.jsm
@@ -7,7 +7,6 @@
var EXPORTED_SYMBOLS = ["EncryptedMediaParent"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/actors/FormValidationChild.jsm b/browser/actors/FormValidationChild.jsm
index 11f0352b006aa..59e1c916b26ee 100644
--- a/browser/actors/FormValidationChild.jsm
+++ b/browser/actors/FormValidationChild.jsm
@@ -13,7 +13,6 @@ var EXPORTED_SYMBOLS = ["FormValidationChild"];
const { LayoutUtils } = ChromeUtils.import(
"resource://gre/modules/LayoutUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
class FormValidationChild extends JSWindowActorChild {
constructor() {
diff --git a/browser/actors/FormValidationParent.jsm b/browser/actors/FormValidationParent.jsm
index b6d32897a8e60..74af9b6fe7482 100644
--- a/browser/actors/FormValidationParent.jsm
+++ b/browser/actors/FormValidationParent.jsm
@@ -18,8 +18,6 @@ ChromeUtils.defineModuleGetter(
"resource:///modules/BrowserWindowTracker.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
class PopupShownObserver {
_weakContext = null;
diff --git a/browser/actors/LightweightThemeChild.jsm b/browser/actors/LightweightThemeChild.jsm
index 15b31242e8b3c..73a1de8394858 100644
--- a/browser/actors/LightweightThemeChild.jsm
+++ b/browser/actors/LightweightThemeChild.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["LightweightThemeChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
/**
* LightweightThemeChild forwards theme data to in-content pages.
* It is both instantiated by the traditional Actor mechanism,
diff --git a/browser/actors/LinkHandlerChild.jsm b/browser/actors/LinkHandlerChild.jsm
index 625a9ba692914..5cb4b171e6d4f 100644
--- a/browser/actors/LinkHandlerChild.jsm
+++ b/browser/actors/LinkHandlerChild.jsm
@@ -6,8 +6,6 @@
const EXPORTED_SYMBOLS = ["LinkHandlerChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/browser/actors/LinkHandlerParent.jsm b/browser/actors/LinkHandlerParent.jsm
index 957ab97bdc64e..55655b0d71fc3 100644
--- a/browser/actors/LinkHandlerParent.jsm
+++ b/browser/actors/LinkHandlerParent.jsm
@@ -6,8 +6,6 @@
const EXPORTED_SYMBOLS = ["LinkHandlerParent"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/browser/actors/NetErrorChild.jsm b/browser/actors/NetErrorChild.jsm
index 622202c2f357e..267631691a28e 100644
--- a/browser/actors/NetErrorChild.jsm
+++ b/browser/actors/NetErrorChild.jsm
@@ -5,7 +5,6 @@
var EXPORTED_SYMBOLS = ["NetErrorChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/actors/NetErrorParent.jsm b/browser/actors/NetErrorParent.jsm
index d94e55b3a81d2..39f4f8e3330cb 100644
--- a/browser/actors/NetErrorParent.jsm
+++ b/browser/actors/NetErrorParent.jsm
@@ -5,7 +5,6 @@
var EXPORTED_SYMBOLS = ["NetErrorParent"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/actors/PageInfoChild.jsm b/browser/actors/PageInfoChild.jsm
index 398efba126539..6796c383e50d1 100644
--- a/browser/actors/PageInfoChild.jsm
+++ b/browser/actors/PageInfoChild.jsm
@@ -4,7 +4,6 @@
var EXPORTED_SYMBOLS = ["PageInfoChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/actors/PluginParent.jsm b/browser/actors/PluginParent.jsm
index 7ddd53c4b4ff1..24ecd46262544 100644
--- a/browser/actors/PluginParent.jsm
+++ b/browser/actors/PluginParent.jsm
@@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = ["PluginParent", "PluginManager"];
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/actors/PromptParent.jsm b/browser/actors/PromptParent.jsm
index f23ac4af589be..9b0e2f4c8b198 100644
--- a/browser/actors/PromptParent.jsm
+++ b/browser/actors/PromptParent.jsm
@@ -14,7 +14,6 @@ ChromeUtils.defineModuleGetter(
"PromptUtils",
"resource://gre/modules/SharedPromptUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/actors/RefreshBlockerChild.jsm b/browser/actors/RefreshBlockerChild.jsm
index ddb860db8434b..73bf1832ef416 100644
--- a/browser/actors/RefreshBlockerChild.jsm
+++ b/browser/actors/RefreshBlockerChild.jsm
@@ -10,7 +10,6 @@
var EXPORTED_SYMBOLS = ["RefreshBlockerChild", "RefreshBlockerObserverChild"];
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
const REFRESHBLOCKING_PREF = "accessibility.blockautorefresh";
diff --git a/browser/actors/SearchSERPTelemetryChild.jsm b/browser/actors/SearchSERPTelemetryChild.jsm
index 9fb56151ee342..4211e8d79354e 100644
--- a/browser/actors/SearchSERPTelemetryChild.jsm
+++ b/browser/actors/SearchSERPTelemetryChild.jsm
@@ -8,7 +8,6 @@ var EXPORTED_SYMBOLS = ["SearchSERPTelemetryChild", "ADLINK_CHECK_TIMEOUT_MS"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/actors/WebRTCChild.jsm b/browser/actors/WebRTCChild.jsm
index 7bff042f76684..8a5f78f63be50 100644
--- a/browser/actors/WebRTCChild.jsm
+++ b/browser/actors/WebRTCChild.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["WebRTCChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/actors/WebRTCParent.jsm b/browser/actors/WebRTCParent.jsm
index 2c71b7d639aa3..e5c80b1f720f2 100644
--- a/browser/actors/WebRTCParent.jsm
+++ b/browser/actors/WebRTCParent.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["WebRTCParent"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/base/content/test/performance/StartupContentSubframe.jsm b/browser/base/content/test/performance/StartupContentSubframe.jsm
index d6b5895341231..71f9c5c461402 100644
--- a/browser/base/content/test/performance/StartupContentSubframe.jsm
+++ b/browser/base/content/test/performance/StartupContentSubframe.jsm
@@ -4,7 +4,6 @@
/**
* test helper JSWindowActors used by the browser_startup_content_subframe.js test.
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var EXPORTED_SYMBOLS = [
"StartupContentSubframeParent",
diff --git a/browser/components/BrowserContentHandler.jsm b/browser/components/BrowserContentHandler.jsm
index 38357d6f3cb17..a9a972a0eaabc 100644
--- a/browser/components/BrowserContentHandler.jsm
+++ b/browser/components/BrowserContentHandler.jsm
@@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = [
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
index 2d6b9bd2990e0..5ef1248db0152 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -12,7 +12,6 @@ var EXPORTED_SYMBOLS = [
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/components/StartupRecorder.jsm b/browser/components/StartupRecorder.jsm
index f800280a7a243..1505ea0a2acc5 100644
--- a/browser/components/StartupRecorder.jsm
+++ b/browser/components/StartupRecorder.jsm
@@ -7,7 +7,6 @@ var EXPORTED_SYMBOLS = ["StartupRecorder"];
const Cm = Components.manager;
Cm.QueryInterface(Ci.nsIServiceManager);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/components/aboutlogins/AboutLoginsChild.jsm b/browser/components/aboutlogins/AboutLoginsChild.jsm
index 025600747741b..c83fb000b67cf 100644
--- a/browser/components/aboutlogins/AboutLoginsChild.jsm
+++ b/browser/components/aboutlogins/AboutLoginsChild.jsm
@@ -12,7 +12,6 @@ const { LoginHelper } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm
index 7f37ce01f062b..43b8375204643 100644
--- a/browser/components/aboutlogins/AboutLoginsParent.jsm
+++ b/browser/components/aboutlogins/AboutLoginsParent.jsm
@@ -13,7 +13,6 @@ const { setTimeout, clearTimeout } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/components/aboutlogins/LoginBreaches.jsm b/browser/components/aboutlogins/LoginBreaches.jsm
index d64d53d1f5472..db19c2d0ea6de 100644
--- a/browser/components/aboutlogins/LoginBreaches.jsm
+++ b/browser/components/aboutlogins/LoginBreaches.jsm
@@ -11,7 +11,6 @@
const EXPORTED_SYMBOLS = ["LoginBreaches"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/attribution/AttributionCode.jsm b/browser/components/attribution/AttributionCode.jsm
index d007c5be28acf..f3da01d9f9016 100644
--- a/browser/components/attribution/AttributionCode.jsm
+++ b/browser/components/attribution/AttributionCode.jsm
@@ -20,7 +20,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/browser/components/attribution/MacAttribution.jsm b/browser/components/attribution/MacAttribution.jsm
index 6e35e55ecb1c4..f4b61aa732de3 100644
--- a/browser/components/attribution/MacAttribution.jsm
+++ b/browser/components/attribution/MacAttribution.jsm
@@ -21,7 +21,6 @@ XPCOMUtils.defineLazyGetter(lazy, "log", () => {
};
return new ConsoleAPI(consoleOptions);
});
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm
index 38a3794b00d64..2a20cb666f547 100644
--- a/browser/components/customizableui/CustomizableUI.jsm
+++ b/browser/components/customizableui/CustomizableUI.jsm
@@ -5,7 +5,6 @@
var EXPORTED_SYMBOLS = ["CustomizableUI"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm
index ea5fb88e5e5b8..bdb844d1d69b3 100644
--- a/browser/components/customizableui/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/CustomizableWidgets.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["CustomizableWidgets"];
const { CustomizableUI } = ChromeUtils.import(
"resource:///modules/CustomizableUI.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/customizableui/CustomizeMode.jsm b/browser/components/customizableui/CustomizeMode.jsm
index 822d73e4531ef..7ca00925dae7c 100644
--- a/browser/components/customizableui/CustomizeMode.jsm
+++ b/browser/components/customizableui/CustomizeMode.jsm
@@ -22,7 +22,6 @@ const kDownloadAutohideCheckboxId = "downloads-button-autohide-checkbox";
const kDownloadAutohidePanelId = "downloads-button-autohide-panel";
const kDownloadAutoHidePref = "browser.download.autohideButton";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { CustomizableUI } = ChromeUtils.import(
"resource:///modules/CustomizableUI.jsm"
);
diff --git a/browser/components/customizableui/PanelMultiView.jsm b/browser/components/customizableui/PanelMultiView.jsm
index e166152ca3d9c..76ca750b10b7a 100644
--- a/browser/components/customizableui/PanelMultiView.jsm
+++ b/browser/components/customizableui/PanelMultiView.jsm
@@ -104,7 +104,6 @@ var EXPORTED_SYMBOLS = ["PanelMultiView", "PanelView"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/browser/components/customizableui/SearchWidgetTracker.jsm b/browser/components/customizableui/SearchWidgetTracker.jsm
index 908e629e11741..46da54ca2605e 100644
--- a/browser/components/customizableui/SearchWidgetTracker.jsm
+++ b/browser/components/customizableui/SearchWidgetTracker.jsm
@@ -11,7 +11,6 @@
var EXPORTED_SYMBOLS = ["SearchWidgetTracker"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/components/doh/DoHConfig.jsm b/browser/components/doh/DoHConfig.jsm
index 7a799b16fa4c9..2a0006bc3f9c4 100644
--- a/browser/components/doh/DoHConfig.jsm
+++ b/browser/components/doh/DoHConfig.jsm
@@ -15,7 +15,6 @@ var EXPORTED_SYMBOLS = ["DoHConfigController"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
);
diff --git a/browser/components/doh/DoHController.jsm b/browser/components/doh/DoHController.jsm
index b71fdb7bf03b1..ecf48bcc202ab 100644
--- a/browser/components/doh/DoHController.jsm
+++ b/browser/components/doh/DoHController.jsm
@@ -11,7 +11,6 @@
*/
var EXPORTED_SYMBOLS = ["DoHController"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/doh/DoHHeuristics.jsm b/browser/components/doh/DoHHeuristics.jsm
index d7f2fc911c597..ca2719f9ee93f 100644
--- a/browser/components/doh/DoHHeuristics.jsm
+++ b/browser/components/doh/DoHHeuristics.jsm
@@ -11,7 +11,6 @@
*/
var EXPORTED_SYMBOLS = ["Heuristics", "parentalControls"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/doh/TRRPerformance.jsm b/browser/components/doh/TRRPerformance.jsm
index f1c5d48420b78..6fdbb9401ec10 100644
--- a/browser/components/doh/TRRPerformance.jsm
+++ b/browser/components/doh/TRRPerformance.jsm
@@ -19,8 +19,6 @@
*/
var EXPORTED_SYMBOLS = ["TRRRacer", "DNSLookup", "LookupAggregator"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
Services.telemetry.setEventRecordingEnabled(
"security.doh.trrPerformance",
true
diff --git a/browser/components/downloads/DownloadsCommon.jsm b/browser/components/downloads/DownloadsCommon.jsm
index ded39723bbaf7..5a2d357c11776 100644
--- a/browser/components/downloads/DownloadsCommon.jsm
+++ b/browser/components/downloads/DownloadsCommon.jsm
@@ -33,7 +33,6 @@ var EXPORTED_SYMBOLS = ["DownloadsCommon"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/downloads/DownloadsTaskbar.jsm b/browser/components/downloads/DownloadsTaskbar.jsm
index 3f03d3b2ecb77..17a8e3f419f32 100644
--- a/browser/components/downloads/DownloadsTaskbar.jsm
+++ b/browser/components/downloads/DownloadsTaskbar.jsm
@@ -17,7 +17,6 @@ var EXPORTED_SYMBOLS = ["DownloadsTaskbar"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
diff --git a/browser/components/downloads/DownloadsViewableInternally.jsm b/browser/components/downloads/DownloadsViewableInternally.jsm
index 035e755251abd..dc05aa0e30ebb 100644
--- a/browser/components/downloads/DownloadsViewableInternally.jsm
+++ b/browser/components/downloads/DownloadsViewableInternally.jsm
@@ -21,7 +21,6 @@ var EXPORTED_SYMBOLS = [
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/enterprisepolicies/Policies.jsm b/browser/components/enterprisepolicies/Policies.jsm
index 93a8481c2c7e8..97398e737371c 100644
--- a/browser/components/enterprisepolicies/Policies.jsm
+++ b/browser/components/enterprisepolicies/Policies.jsm
@@ -9,7 +9,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/components/enterprisepolicies/helpers/BookmarksPolicies.jsm b/browser/components/enterprisepolicies/helpers/BookmarksPolicies.jsm
index f931fc89ed8b3..9ce4a04b9b290 100644
--- a/browser/components/enterprisepolicies/helpers/BookmarksPolicies.jsm
+++ b/browser/components/enterprisepolicies/helpers/BookmarksPolicies.jsm
@@ -42,7 +42,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm b/browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm
index b275e300d0e41..0f7adb35a9ffa 100644
--- a/browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm
+++ b/browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm
@@ -29,7 +29,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const LIST_LENGTH_LIMIT = 1000;
diff --git a/browser/components/extensions/ExtensionControlledPopup.jsm b/browser/components/extensions/ExtensionControlledPopup.jsm
index d762b1b6f971f..232a9e04cb5b0 100644
--- a/browser/components/extensions/ExtensionControlledPopup.jsm
+++ b/browser/components/extensions/ExtensionControlledPopup.jsm
@@ -19,7 +19,6 @@
var EXPORTED_SYMBOLS = ["ExtensionControlledPopup"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { ExtensionCommon } = ChromeUtils.import(
"resource://gre/modules/ExtensionCommon.jsm"
);
diff --git a/browser/components/extensions/test/AppUiTestDelegate.jsm b/browser/components/extensions/test/AppUiTestDelegate.jsm
index b38e79fcb5448..5c258906bbee1 100644
--- a/browser/components/extensions/test/AppUiTestDelegate.jsm
+++ b/browser/components/extensions/test/AppUiTestDelegate.jsm
@@ -4,7 +4,6 @@
"use strict";
const { Assert } = ChromeUtils.import("resource://testing-common/Assert.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { BrowserTestUtils } = ChromeUtils.import(
"resource://testing-common/BrowserTestUtils.jsm"
);
diff --git a/browser/components/installerprefs/InstallerPrefs.jsm b/browser/components/installerprefs/InstallerPrefs.jsm
index 6366ccf5dfb0b..cf9a1c47e6d01 100644
--- a/browser/components/installerprefs/InstallerPrefs.jsm
+++ b/browser/components/installerprefs/InstallerPrefs.jsm
@@ -35,7 +35,6 @@ const INSTALLER_PREFS_LIST = ["installer.taskbarpin.win10.enabled"];
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/migration/ChromeMigrationUtils.jsm b/browser/components/migration/ChromeMigrationUtils.jsm
index 6f6dc1f6def14..422227ff6335b 100644
--- a/browser/components/migration/ChromeMigrationUtils.jsm
+++ b/browser/components/migration/ChromeMigrationUtils.jsm
@@ -8,7 +8,6 @@ var EXPORTED_SYMBOLS = ["ChromeMigrationUtils"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/components/migration/ChromeProfileMigrator.jsm b/browser/components/migration/ChromeProfileMigrator.jsm
index 51d1d897d0e64..52e7096f22143 100644
--- a/browser/components/migration/ChromeProfileMigrator.jsm
+++ b/browser/components/migration/ChromeProfileMigrator.jsm
@@ -15,7 +15,6 @@ const AUTH_TYPE = {
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/components/migration/ESEDBReader.jsm b/browser/components/migration/ESEDBReader.jsm
index 3ba21f0ccd61c..e7806ba3c83d5 100644
--- a/browser/components/migration/ESEDBReader.jsm
+++ b/browser/components/migration/ESEDBReader.jsm
@@ -19,7 +19,6 @@ const { ctypes } = ChromeUtils.import("resource://gre/modules/ctypes.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
XPCOMUtils.defineLazyGetter(lazy, "log", () => {
let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
diff --git a/browser/components/migration/FirefoxProfileMigrator.jsm b/browser/components/migration/FirefoxProfileMigrator.jsm
index ca5acd1cedd60..10decf16e75d7 100644
--- a/browser/components/migration/FirefoxProfileMigrator.jsm
+++ b/browser/components/migration/FirefoxProfileMigrator.jsm
@@ -16,7 +16,6 @@
const { MigrationUtils, MigratorPrototype } = ChromeUtils.import(
"resource:///modules/MigrationUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/migration/IEProfileMigrator.jsm b/browser/components/migration/IEProfileMigrator.jsm
index 0fd1e86eb15db..a1c5a40c75a19 100644
--- a/browser/components/migration/IEProfileMigrator.jsm
+++ b/browser/components/migration/IEProfileMigrator.jsm
@@ -11,7 +11,6 @@ const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { MigrationUtils, MigratorPrototype } = ChromeUtils.import(
"resource:///modules/MigrationUtils.jsm"
);
diff --git a/browser/components/migration/MSMigrationUtils.jsm b/browser/components/migration/MSMigrationUtils.jsm
index 0427a37b714e4..4a17e444f1442 100644
--- a/browser/components/migration/MSMigrationUtils.jsm
+++ b/browser/components/migration/MSMigrationUtils.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["MSMigrationUtils"];
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { MigrationUtils } = ChromeUtils.import(
"resource:///modules/MigrationUtils.jsm"
);
diff --git a/browser/components/migration/MigrationUtils.jsm b/browser/components/migration/MigrationUtils.jsm
index d738471a1c306..e8055596c36b3 100644
--- a/browser/components/migration/MigrationUtils.jsm
+++ b/browser/components/migration/MigrationUtils.jsm
@@ -15,7 +15,6 @@ const TOPIC_PLACES_DEFAULTS_FINISHED = "places-browser-init-complete";
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/newtab/AboutNewTabService.jsm b/browser/components/newtab/AboutNewTabService.jsm
index 568964fdd486b..47252d134ce33 100644
--- a/browser/components/newtab/AboutNewTabService.jsm
+++ b/browser/components/newtab/AboutNewTabService.jsm
@@ -30,7 +30,6 @@ const EXPORTED_SYMBOLS = [
* been put into an abstract base class.
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/newtab/aboutwelcome/AboutWelcomeParent.jsm b/browser/components/newtab/aboutwelcome/AboutWelcomeParent.jsm
index f6134a716616d..93cc6ce581fbf 100644
--- a/browser/components/newtab/aboutwelcome/AboutWelcomeParent.jsm
+++ b/browser/components/newtab/aboutwelcome/AboutWelcomeParent.jsm
@@ -5,7 +5,6 @@
"use strict";
const EXPORTED_SYMBOLS = ["AboutWelcomeParent"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
diff --git a/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm b/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm
index 9c572cc413c84..1a1f5ce510409 100644
--- a/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm
+++ b/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm
@@ -8,7 +8,6 @@ const EXPORTED_SYMBOLS = ["AboutWelcomeDefaults", "DEFAULT_WELCOME_CONTENT"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/components/newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm b/browser/components/newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm
index 9a8b186b96442..72e48667a14a6 100644
--- a/browser/components/newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm
+++ b/browser/components/newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm
@@ -7,7 +7,6 @@ const EXPORTED_SYMBOLS = ["AboutWelcomeTelemetry"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/newtab/lib/ASRouter.jsm b/browser/components/newtab/lib/ASRouter.jsm
index b16cc8c0259d3..0aec15c1c67e2 100644
--- a/browser/components/newtab/lib/ASRouter.jsm
+++ b/browser/components/newtab/lib/ASRouter.jsm
@@ -4,7 +4,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/newtab/lib/ASRouterPreferences.jsm b/browser/components/newtab/lib/ASRouterPreferences.jsm
index b7b6a12df568b..68117d48bf30d 100644
--- a/browser/components/newtab/lib/ASRouterPreferences.jsm
+++ b/browser/components/newtab/lib/ASRouterPreferences.jsm
@@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/newtab/lib/ASRouterTargeting.jsm b/browser/components/newtab/lib/ASRouterTargeting.jsm
index 0ce47049049c4..8a91fa25b4daa 100644
--- a/browser/components/newtab/lib/ASRouterTargeting.jsm
+++ b/browser/components/newtab/lib/ASRouterTargeting.jsm
@@ -6,7 +6,6 @@ const FXA_ENABLED_PREF = "identity.fxaccounts.enabled";
const DISTRIBUTION_ID_PREF = "distribution.id";
const DISTRIBUTION_ID_CHINA_REPACK = "MozillaOnline";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/newtab/lib/ASRouterTriggerListeners.jsm b/browser/components/newtab/lib/ASRouterTriggerListeners.jsm
index defe14730baa9..a497fdb0ac2f0 100644
--- a/browser/components/newtab/lib/ASRouterTriggerListeners.jsm
+++ b/browser/components/newtab/lib/ASRouterTriggerListeners.jsm
@@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/newtab/lib/AboutPreferences.jsm b/browser/components/newtab/lib/AboutPreferences.jsm
index e94b1d4616008..0a45eb52aaf4b 100644
--- a/browser/components/newtab/lib/AboutPreferences.jsm
+++ b/browser/components/newtab/lib/AboutPreferences.jsm
@@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/newtab/lib/ActivityStream.jsm b/browser/components/newtab/lib/ActivityStream.jsm
index e19a715489155..f6eea6f9475e8 100644
--- a/browser/components/newtab/lib/ActivityStream.jsm
+++ b/browser/components/newtab/lib/ActivityStream.jsm
@@ -3,8 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/components/newtab/lib/CFRPageActions.jsm b/browser/components/newtab/lib/CFRPageActions.jsm
index 91cb25ab6a7b1..04b0d695bbc62 100644
--- a/browser/components/newtab/lib/CFRPageActions.jsm
+++ b/browser/components/newtab/lib/CFRPageActions.jsm
@@ -6,7 +6,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/newtab/lib/DiscoveryStreamFeed.jsm b/browser/components/newtab/lib/DiscoveryStreamFeed.jsm
index 3c3383bd33cf9..4ace58d4066a4 100644
--- a/browser/components/newtab/lib/DiscoveryStreamFeed.jsm
+++ b/browser/components/newtab/lib/DiscoveryStreamFeed.jsm
@@ -22,7 +22,6 @@ ChromeUtils.defineModuleGetter(
const { setTimeout, clearTimeout } = ChromeUtils.import(
"resource://gre/modules/Timer.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { actionTypes: at, actionCreators: ac } = ChromeUtils.import(
"resource://activity-stream/common/Actions.jsm"
);
diff --git a/browser/components/newtab/lib/FaviconFeed.jsm b/browser/components/newtab/lib/FaviconFeed.jsm
index 6d7d2243e3838..27988b1841c4a 100644
--- a/browser/components/newtab/lib/FaviconFeed.jsm
+++ b/browser/components/newtab/lib/FaviconFeed.jsm
@@ -20,7 +20,6 @@ ChromeUtils.defineModuleGetter(
"PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(
lazy,
"NewTabUtils",
diff --git a/browser/components/newtab/lib/FilterAdult.jsm b/browser/components/newtab/lib/FilterAdult.jsm
index 121c9fb389820..4174df1137468 100644
--- a/browser/components/newtab/lib/FilterAdult.jsm
+++ b/browser/components/newtab/lib/FilterAdult.jsm
@@ -7,8 +7,6 @@ const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
XPCOMUtils.defineLazyPreferenceGetter(
diff --git a/browser/components/newtab/lib/HighlightsFeed.jsm b/browser/components/newtab/lib/HighlightsFeed.jsm
index b99110637aed9..c44a8122e91fb 100644
--- a/browser/components/newtab/lib/HighlightsFeed.jsm
+++ b/browser/components/newtab/lib/HighlightsFeed.jsm
@@ -3,8 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { actionTypes: at } = ChromeUtils.import(
"resource://activity-stream/common/Actions.jsm"
);
diff --git a/browser/components/newtab/lib/InfoBar.jsm b/browser/components/newtab/lib/InfoBar.jsm
index 3a4e857a0b002..1c8f88aa9ce73 100644
--- a/browser/components/newtab/lib/InfoBar.jsm
+++ b/browser/components/newtab/lib/InfoBar.jsm
@@ -6,7 +6,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/newtab/lib/MomentsPageHub.jsm b/browser/components/newtab/lib/MomentsPageHub.jsm
index 4a76114b0eee9..1f22d5e1bd9c6 100644
--- a/browser/components/newtab/lib/MomentsPageHub.jsm
+++ b/browser/components/newtab/lib/MomentsPageHub.jsm
@@ -6,7 +6,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
index 4bf771915a6d0..188615999c844 100644
--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
@@ -7,7 +7,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/newtab/lib/PersonalityProvider/PersonalityProvider.jsm b/browser/components/newtab/lib/PersonalityProvider/PersonalityProvider.jsm
index 841d4c8ca30c7..fb8af60dc0cce 100644
--- a/browser/components/newtab/lib/PersonalityProvider/PersonalityProvider.jsm
+++ b/browser/components/newtab/lib/PersonalityProvider/PersonalityProvider.jsm
@@ -17,8 +17,6 @@ ChromeUtils.defineModuleGetter(
"resource://gre/modules/NewTabUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { BasePromiseWorker } = ChromeUtils.import(
"resource://gre/modules/PromiseWorker.jsm"
);
diff --git a/browser/components/newtab/lib/PlacesFeed.jsm b/browser/components/newtab/lib/PlacesFeed.jsm
index 58c679bcf3f84..dbdf99e1e9e3f 100644
--- a/browser/components/newtab/lib/PlacesFeed.jsm
+++ b/browser/components/newtab/lib/PlacesFeed.jsm
@@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/newtab/lib/PrefsFeed.jsm b/browser/components/newtab/lib/PrefsFeed.jsm
index 5350048a49bba..ec8a1525b9afc 100644
--- a/browser/components/newtab/lib/PrefsFeed.jsm
+++ b/browser/components/newtab/lib/PrefsFeed.jsm
@@ -12,7 +12,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { Prefs } = ChromeUtils.import(
"resource://activity-stream/lib/ActivityStreamPrefs.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/components/newtab/lib/RemoteImages.jsm b/browser/components/newtab/lib/RemoteImages.jsm
index c8efbfccdc99a..77bf821f221cb 100644
--- a/browser/components/newtab/lib/RemoteImages.jsm
+++ b/browser/components/newtab/lib/RemoteImages.jsm
@@ -10,7 +10,6 @@ const { PromiseUtils } = ChromeUtils.import(
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/newtab/lib/RemoteL10n.jsm b/browser/components/newtab/lib/RemoteL10n.jsm
index e6465137620d5..a91a189a3626b 100644
--- a/browser/components/newtab/lib/RemoteL10n.jsm
+++ b/browser/components/newtab/lib/RemoteL10n.jsm
@@ -10,8 +10,6 @@
const USE_REMOTE_L10N_PREF =
"browser.newtabpage.activity-stream.asrouter.useRemoteL10n";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
/**
* All supported locales for remote l10n
*
diff --git a/browser/components/newtab/lib/Screenshots.jsm b/browser/components/newtab/lib/Screenshots.jsm
index ccf5c4c65070a..6af78af7b0a7b 100644
--- a/browser/components/newtab/lib/Screenshots.jsm
+++ b/browser/components/newtab/lib/Screenshots.jsm
@@ -26,7 +26,6 @@ ChromeUtils.defineModuleGetter(
"PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const GREY_10 = "#F9F9FA";
diff --git a/browser/components/newtab/lib/SearchShortcuts.jsm b/browser/components/newtab/lib/SearchShortcuts.jsm
index 92c13d917e8aa..926681fecaae2 100644
--- a/browser/components/newtab/lib/SearchShortcuts.jsm
+++ b/browser/components/newtab/lib/SearchShortcuts.jsm
@@ -3,8 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
// List of sites we match against Topsites in order to identify sites
// that should be converted to search Topsites
const SEARCH_SHORTCUTS = [
diff --git a/browser/components/newtab/lib/SectionsManager.jsm b/browser/components/newtab/lib/SectionsManager.jsm
index 7095eaab23d98..779f47ad01251 100644
--- a/browser/components/newtab/lib/SectionsManager.jsm
+++ b/browser/components/newtab/lib/SectionsManager.jsm
@@ -6,7 +6,6 @@
const { EventEmitter } = ChromeUtils.import(
"resource://gre/modules/EventEmitter.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/newtab/lib/ShortURL.jsm b/browser/components/newtab/lib/ShortURL.jsm
index cbcebae6118c3..448b4292078e5 100644
--- a/browser/components/newtab/lib/ShortURL.jsm
+++ b/browser/components/newtab/lib/ShortURL.jsm
@@ -5,7 +5,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/newtab/lib/TelemetryFeed.jsm b/browser/components/newtab/lib/TelemetryFeed.jsm
index 494eed4a18875..950f431366637 100644
--- a/browser/components/newtab/lib/TelemetryFeed.jsm
+++ b/browser/components/newtab/lib/TelemetryFeed.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/newtab/lib/TippyTopProvider.jsm b/browser/components/newtab/lib/TippyTopProvider.jsm
index ab2895f35a5c7..a16575547ef85 100644
--- a/browser/components/newtab/lib/TippyTopProvider.jsm
+++ b/browser/components/newtab/lib/TippyTopProvider.jsm
@@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const TIPPYTOP_PATH = "chrome://activity-stream/content/data/content/tippytop/";
const TIPPYTOP_JSON_PATH =
"chrome://activity-stream/content/data/content/tippytop/top_sites.json";
diff --git a/browser/components/newtab/lib/ToolbarBadgeHub.jsm b/browser/components/newtab/lib/ToolbarBadgeHub.jsm
index b9fa60bdfa131..2ed4fde27514c 100644
--- a/browser/components/newtab/lib/ToolbarBadgeHub.jsm
+++ b/browser/components/newtab/lib/ToolbarBadgeHub.jsm
@@ -6,7 +6,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/newtab/lib/ToolbarPanelHub.jsm b/browser/components/newtab/lib/ToolbarPanelHub.jsm
index 62d98c4b2754f..3da367d3a3813 100644
--- a/browser/components/newtab/lib/ToolbarPanelHub.jsm
+++ b/browser/components/newtab/lib/ToolbarPanelHub.jsm
@@ -6,7 +6,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
EveryWindow: "resource:///modules/EveryWindow.jsm",
diff --git a/browser/components/newtab/lib/TopSitesFeed.jsm b/browser/components/newtab/lib/TopSitesFeed.jsm
index cc5438dac8e10..22c013957dec3 100644
--- a/browser/components/newtab/lib/TopSitesFeed.jsm
+++ b/browser/components/newtab/lib/TopSitesFeed.jsm
@@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/newtab/lib/TopStoriesFeed.jsm b/browser/components/newtab/lib/TopStoriesFeed.jsm
index 811159bbdaa35..b1f1020333f1d 100644
--- a/browser/components/newtab/lib/TopStoriesFeed.jsm
+++ b/browser/components/newtab/lib/TopStoriesFeed.jsm
@@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { NewTabUtils } = ChromeUtils.import(
"resource://gre/modules/NewTabUtils.jsm"
);
diff --git a/browser/components/newtab/lib/UTEventReporting.jsm b/browser/components/newtab/lib/UTEventReporting.jsm
index b2ef09a8085b8..612fb969384fd 100644
--- a/browser/components/newtab/lib/UTEventReporting.jsm
+++ b/browser/components/newtab/lib/UTEventReporting.jsm
@@ -4,8 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
/**
* Note: the schema can be found in
* https://searchfox.org/mozilla-central/source/toolkit/components/telemetry/Events.yaml
diff --git a/browser/components/newtab/test/RemoteImagesTestUtils.jsm b/browser/components/newtab/test/RemoteImagesTestUtils.jsm
index b89ecfd0720a1..5767c25e6f65f 100644
--- a/browser/components/newtab/test/RemoteImagesTestUtils.jsm
+++ b/browser/components/newtab/test/RemoteImagesTestUtils.jsm
@@ -8,7 +8,6 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
const { RemoteImages, REMOTE_IMAGES_PATH } = ChromeUtils.import(
"resource://activity-stream/lib/RemoteImages.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const RS_SERVER_PREF = "services.settings.server";
class RemoteSettingsRecord {
diff --git a/browser/components/pagedata/PageDataSchema.jsm b/browser/components/pagedata/PageDataSchema.jsm
index 29b757dbebecc..d858641df7c96 100644
--- a/browser/components/pagedata/PageDataSchema.jsm
+++ b/browser/components/pagedata/PageDataSchema.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["PageDataSchema"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/pagedata/PageDataService.jsm b/browser/components/pagedata/PageDataService.jsm
index e70e04505fb51..97a5de623d8b7 100644
--- a/browser/components/pagedata/PageDataService.jsm
+++ b/browser/components/pagedata/PageDataService.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["PageDataService"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { EventEmitter } = ChromeUtils.import(
"resource://gre/modules/EventEmitter.jsm"
);
diff --git a/browser/components/places/Interactions.jsm b/browser/components/places/Interactions.jsm
index 8645b494243b2..9b64707006f0d 100644
--- a/browser/components/places/Interactions.jsm
+++ b/browser/components/places/Interactions.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["Interactions"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/places/InteractionsBlocklist.jsm b/browser/components/places/InteractionsBlocklist.jsm
index ee2b94ab25ace..eb6f14641dda9 100644
--- a/browser/components/places/InteractionsBlocklist.jsm
+++ b/browser/components/places/InteractionsBlocklist.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["InteractionsBlocklist"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/places/InteractionsChild.jsm b/browser/components/places/InteractionsChild.jsm
index 642fd52dca9bc..8136b63209497 100644
--- a/browser/components/places/InteractionsChild.jsm
+++ b/browser/components/places/InteractionsChild.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["InteractionsChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/places/PlacesUIUtils.jsm b/browser/components/places/PlacesUIUtils.jsm
index 28175ac445152..402c382ee506b 100644
--- a/browser/components/places/PlacesUIUtils.jsm
+++ b/browser/components/places/PlacesUIUtils.jsm
@@ -8,7 +8,6 @@ var EXPORTED_SYMBOLS = ["PlacesUIUtils"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { clearTimeout, setTimeout } = ChromeUtils.import(
"resource://gre/modules/Timer.jsm"
);
diff --git a/browser/components/places/SnapshotGroups.jsm b/browser/components/places/SnapshotGroups.jsm
index eb6254f4fff24..2a5b58e310d98 100644
--- a/browser/components/places/SnapshotGroups.jsm
+++ b/browser/components/places/SnapshotGroups.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["SnapshotGroups"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/places/SnapshotMonitor.jsm b/browser/components/places/SnapshotMonitor.jsm
index 76fbda59d9da3..8ba391acf9ef7 100644
--- a/browser/components/places/SnapshotMonitor.jsm
+++ b/browser/components/places/SnapshotMonitor.jsm
@@ -7,7 +7,6 @@ const EXPORTED_SYMBOLS = ["SnapshotMonitor"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/places/SnapshotScorer.jsm b/browser/components/places/SnapshotScorer.jsm
index d63a0ce42bc69..10f9ad46b2c7a 100644
--- a/browser/components/places/SnapshotScorer.jsm
+++ b/browser/components/places/SnapshotScorer.jsm
@@ -7,7 +7,6 @@ const EXPORTED_SYMBOLS = ["SnapshotScorer"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/places/SnapshotSelector.jsm b/browser/components/places/SnapshotSelector.jsm
index aa0f45134e3cd..2fb41f6333369 100644
--- a/browser/components/places/SnapshotSelector.jsm
+++ b/browser/components/places/SnapshotSelector.jsm
@@ -6,7 +6,6 @@ const EXPORTED_SYMBOLS = ["SnapshotSelector"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { EventEmitter } = ChromeUtils.import(
"resource://gre/modules/EventEmitter.jsm"
);
diff --git a/browser/components/places/Snapshots.jsm b/browser/components/places/Snapshots.jsm
index f6d74594f2de3..08dcda74b9d26 100644
--- a/browser/components/places/Snapshots.jsm
+++ b/browser/components/places/Snapshots.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["Snapshots"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/pocket/content/Pocket.jsm b/browser/components/pocket/content/Pocket.jsm
index 2b55647e3e426..3747afdba2a25 100644
--- a/browser/components/pocket/content/Pocket.jsm
+++ b/browser/components/pocket/content/Pocket.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["Pocket"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/browser/components/pocket/content/SaveToPocket.jsm b/browser/components/pocket/content/SaveToPocket.jsm
index 4b0617732c6e0..9319db6716826 100644
--- a/browser/components/pocket/content/SaveToPocket.jsm
+++ b/browser/components/pocket/content/SaveToPocket.jsm
@@ -8,7 +8,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/browser/components/pocket/content/pktApi.jsm b/browser/components/pocket/content/pktApi.jsm
index 4a87c78574ddd..1e4d956b429c2 100644
--- a/browser/components/pocket/content/pktApi.jsm
+++ b/browser/components/pocket/content/pktApi.jsm
@@ -47,7 +47,6 @@ var EXPORTED_SYMBOLS = ["pktApi"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/browser/components/pocket/content/pktTelemetry.jsm b/browser/components/pocket/content/pktTelemetry.jsm
index 17222f0c781bf..70b83f3080934 100644
--- a/browser/components/pocket/content/pktTelemetry.jsm
+++ b/browser/components/pocket/content/pktTelemetry.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["pktTelemetry"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/browser/components/prompts/PromptCollection.jsm b/browser/components/prompts/PromptCollection.jsm
index 93d533c935d4c..d32aec188033b 100644
--- a/browser/components/prompts/PromptCollection.jsm
+++ b/browser/components/prompts/PromptCollection.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["PromptCollection"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/protocolhandler/WebProtocolHandlerRegistrar.jsm b/browser/components/protocolhandler/WebProtocolHandlerRegistrar.jsm
index 6cda756059bf3..31bc231bc5471 100644
--- a/browser/components/protocolhandler/WebProtocolHandlerRegistrar.jsm
+++ b/browser/components/protocolhandler/WebProtocolHandlerRegistrar.jsm
@@ -5,8 +5,6 @@
var EXPORTED_SYMBOLS = ["WebProtocolHandlerRegistrar"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const STRING_BUNDLE_URI = "chrome://browser/locale/feeds/subscribe.properties";
function WebProtocolHandlerRegistrar() {}
diff --git a/browser/components/screenshots/ScreenshotsUtils.jsm b/browser/components/screenshots/ScreenshotsUtils.jsm
index cda56677959cb..70a8782150e04 100644
--- a/browser/components/screenshots/ScreenshotsUtils.jsm
+++ b/browser/components/screenshots/ScreenshotsUtils.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["ScreenshotsUtils", "ScreenshotsComponentParent"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/search/BrowserSearchTelemetry.jsm b/browser/components/search/BrowserSearchTelemetry.jsm
index 468cdb435bc11..4bd2de7e217c2 100644
--- a/browser/components/search/BrowserSearchTelemetry.jsm
+++ b/browser/components/search/BrowserSearchTelemetry.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["BrowserSearchTelemetry"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/search/SearchOneOffs.jsm b/browser/components/search/SearchOneOffs.jsm
index 607ac32542f23..e5132e7a3bdc0 100644
--- a/browser/components/search/SearchOneOffs.jsm
+++ b/browser/components/search/SearchOneOffs.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["SearchOneOffs"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
diff --git a/browser/components/search/SearchSERPTelemetry.jsm b/browser/components/search/SearchSERPTelemetry.jsm
index 80a6032bd13bb..8708be77ed2d9 100644
--- a/browser/components/search/SearchSERPTelemetry.jsm
+++ b/browser/components/search/SearchSERPTelemetry.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["SearchSERPTelemetry"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/search/SearchUIUtils.jsm b/browser/components/search/SearchUIUtils.jsm
index 644b4559d1623..7364655dfd618 100644
--- a/browser/components/search/SearchUIUtils.jsm
+++ b/browser/components/search/SearchUIUtils.jsm
@@ -11,7 +11,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/sessionstore/ContentRestore.jsm b/browser/components/sessionstore/ContentRestore.jsm
index 9efb54b140d08..fae7cd75d7876 100644
--- a/browser/components/sessionstore/ContentRestore.jsm
+++ b/browser/components/sessionstore/ContentRestore.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["ContentRestore"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/browser/components/sessionstore/ContentSessionStore.jsm b/browser/components/sessionstore/ContentSessionStore.jsm
index 4991c9654e756..55f23cf562b84 100644
--- a/browser/components/sessionstore/ContentSessionStore.jsm
+++ b/browser/components/sessionstore/ContentSessionStore.jsm
@@ -12,7 +12,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { clearTimeout, setTimeoutWithTarget } = ChromeUtils.import(
"resource://gre/modules/Timer.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
function debug(msg) {
Services.console.logStringMessage("SessionStoreContent: " + msg);
diff --git a/browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm b/browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
index a4f68a9af0878..5c3328f2f496a 100644
--- a/browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
+++ b/browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
@@ -4,8 +4,6 @@
var EXPORTED_SYMBOLS = ["RecentlyClosedTabsAndWindowsMenuUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/browser/components/sessionstore/SessionCookies.jsm b/browser/components/sessionstore/SessionCookies.jsm
index 2edb347e6036a..b5fbfc49ee62f 100644
--- a/browser/components/sessionstore/SessionCookies.jsm
+++ b/browser/components/sessionstore/SessionCookies.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["SessionCookies"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/browser/components/sessionstore/SessionFile.jsm b/browser/components/sessionstore/SessionFile.jsm
index 56e059963e40d..fc7e8a12dd995 100644
--- a/browser/components/sessionstore/SessionFile.jsm
+++ b/browser/components/sessionstore/SessionFile.jsm
@@ -19,7 +19,6 @@ var EXPORTED_SYMBOLS = ["SessionFile"];
* another attempts to copy that file.
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/sessionstore/SessionSaver.jsm b/browser/components/sessionstore/SessionSaver.jsm
index bcd00038ec567..78e657606f3a0 100644
--- a/browser/components/sessionstore/SessionSaver.jsm
+++ b/browser/components/sessionstore/SessionSaver.jsm
@@ -12,7 +12,6 @@ const {
requestIdleCallback,
setTimeout,
} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/sessionstore/SessionStartup.jsm b/browser/components/sessionstore/SessionStartup.jsm
index d85033c18cf09..f213a8f00ee5e 100644
--- a/browser/components/sessionstore/SessionStartup.jsm
+++ b/browser/components/sessionstore/SessionStartup.jsm
@@ -33,8 +33,6 @@ var EXPORTED_SYMBOLS = ["SessionStartup"];
/* :::::::: Constants and Helpers ::::::::::::::: */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/browser/components/sessionstore/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm
index 9b2730f1d525f..74c509bd299b2 100644
--- a/browser/components/sessionstore/SessionStore.jsm
+++ b/browser/components/sessionstore/SessionStore.jsm
@@ -220,7 +220,6 @@ const kLastIndex = Number.MAX_SAFE_INTEGER - 1;
const { PrivateBrowsingUtils } = ChromeUtils.import(
"resource://gre/modules/PrivateBrowsingUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { TelemetryTimestamps } = ChromeUtils.import(
"resource://gre/modules/TelemetryTimestamps.jsm"
);
diff --git a/browser/components/sessionstore/StartupPerformance.jsm b/browser/components/sessionstore/StartupPerformance.jsm
index a58f5247fca5e..d05f32f2bb481 100644
--- a/browser/components/sessionstore/StartupPerformance.jsm
+++ b/browser/components/sessionstore/StartupPerformance.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["StartupPerformance"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/browser/components/sessionstore/TabStateFlusher.jsm b/browser/components/sessionstore/TabStateFlusher.jsm
index 1d54c23f6e88d..887f3ab606042 100644
--- a/browser/components/sessionstore/TabStateFlusher.jsm
+++ b/browser/components/sessionstore/TabStateFlusher.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["TabStateFlusher"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/browser/components/shell/HeadlessShell.jsm b/browser/components/shell/HeadlessShell.jsm
index c3af52a76e423..58601ec367eac 100644
--- a/browser/components/shell/HeadlessShell.jsm
+++ b/browser/components/shell/HeadlessShell.jsm
@@ -12,7 +12,6 @@ const { E10SUtils } = ChromeUtils.import(
const { HiddenFrame } = ChromeUtils.import(
"resource://gre/modules/HiddenFrame.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Refrences to the progress listeners to keep them from being gc'ed
// before they are called.
diff --git a/browser/components/shell/ShellService.jsm b/browser/components/shell/ShellService.jsm
index ac8f5fbe8c0e5..dd9d90e5624e8 100644
--- a/browser/components/shell/ShellService.jsm
+++ b/browser/components/shell/ShellService.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["ShellService"];
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/touchbar/MacTouchBar.jsm b/browser/components/touchbar/MacTouchBar.jsm
index 70fbe740a5658..cf297410e86ce 100644
--- a/browser/components/touchbar/MacTouchBar.jsm
+++ b/browser/components/touchbar/MacTouchBar.jsm
@@ -7,7 +7,6 @@ var EXPORTED_SYMBOLS = ["TouchBarHelper", "TouchBarInput"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/translation/BingTranslator.jsm b/browser/components/translation/BingTranslator.jsm
index 2ffde520d8519..5f37f6182b7dc 100644
--- a/browser/components/translation/BingTranslator.jsm
+++ b/browser/components/translation/BingTranslator.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["BingTranslator"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { PromiseUtils } = ChromeUtils.import(
"resource://gre/modules/PromiseUtils.jsm"
);
diff --git a/browser/components/translation/GoogleTranslator.jsm b/browser/components/translation/GoogleTranslator.jsm
index 222df0e4dc2ba..9d68607916b42 100644
--- a/browser/components/translation/GoogleTranslator.jsm
+++ b/browser/components/translation/GoogleTranslator.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["GoogleTranslator"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { PromiseUtils } = ChromeUtils.import(
"resource://gre/modules/PromiseUtils.jsm"
);
diff --git a/browser/components/translation/TranslationChild.jsm b/browser/components/translation/TranslationChild.jsm
index 5d793c1ec5938..1cce1206b02ef 100644
--- a/browser/components/translation/TranslationChild.jsm
+++ b/browser/components/translation/TranslationChild.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["TranslationChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/browser/components/translation/TranslationParent.jsm b/browser/components/translation/TranslationParent.jsm
index 9cd082ff356cd..d47f0dfde6e15 100644
--- a/browser/components/translation/TranslationParent.jsm
+++ b/browser/components/translation/TranslationParent.jsm
@@ -13,8 +13,6 @@ var EXPORTED_SYMBOLS = [
const TRANSLATION_PREF_SHOWUI = "browser.translation.ui.show";
const TRANSLATION_PREF_DETECT_LANG = "browser.translation.detectLanguage";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var Translation = {
STATE_OFFER: 0,
STATE_TRANSLATING: 1,
diff --git a/browser/components/translation/YandexTranslator.jsm b/browser/components/translation/YandexTranslator.jsm
index 7db0ffaa09242..82550b1b5721e 100644
--- a/browser/components/translation/YandexTranslator.jsm
+++ b/browser/components/translation/YandexTranslator.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["YandexTranslator"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { PromiseUtils } = ChromeUtils.import(
"resource://gre/modules/PromiseUtils.jsm"
);
diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm
index 6eaf1118e5d16..798e6dfc114fb 100644
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["UITour"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/components/uitour/UITourChild.jsm b/browser/components/uitour/UITourChild.jsm
index e2e763c8f4c13..7e3a520623165 100644
--- a/browser/components/uitour/UITourChild.jsm
+++ b/browser/components/uitour/UITourChild.jsm
@@ -4,8 +4,6 @@
var EXPORTED_SYMBOLS = ["UITourChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const PREF_TEST_WHITELIST = "browser.uitour.testingOrigins";
const UITOUR_PERMISSION = "uitour";
diff --git a/browser/components/urlbar/QuickActionsLoaderDefault.jsm b/browser/components/urlbar/QuickActionsLoaderDefault.jsm
index 3ebf71a92afb1..16bbf9411f646 100644
--- a/browser/components/urlbar/QuickActionsLoaderDefault.jsm
+++ b/browser/components/urlbar/QuickActionsLoaderDefault.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["QuickActionsLoaderDefault"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
diff --git a/browser/components/urlbar/UrlbarController.jsm b/browser/components/urlbar/UrlbarController.jsm
index 95ee09f327f74..ac9e363d98305 100644
--- a/browser/components/urlbar/UrlbarController.jsm
+++ b/browser/components/urlbar/UrlbarController.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["UrlbarController"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/components/urlbar/UrlbarEventBufferer.jsm b/browser/components/urlbar/UrlbarEventBufferer.jsm
index a9f0c2a41d4d7..da354c033946f 100644
--- a/browser/components/urlbar/UrlbarEventBufferer.jsm
+++ b/browser/components/urlbar/UrlbarEventBufferer.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["UrlbarEventBufferer"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
index 084119d494759..8b823e090ea10 100644
--- a/browser/components/urlbar/UrlbarInput.jsm
+++ b/browser/components/urlbar/UrlbarInput.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["UrlbarInput"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm b/browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm
index b651921667575..ffee6232668e6 100644
--- a/browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm
+++ b/browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm
@@ -13,7 +13,6 @@ var EXPORTED_SYMBOLS = ["UrlbarMuxerUnifiedComplete"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { UrlbarMuxer, UrlbarUtils } = ChromeUtils.import(
"resource:///modules/UrlbarUtils.jsm"
diff --git a/browser/components/urlbar/UrlbarPrefs.jsm b/browser/components/urlbar/UrlbarPrefs.jsm
index 65ce3ce0037f5..bce44787f764d 100644
--- a/browser/components/urlbar/UrlbarPrefs.jsm
+++ b/browser/components/urlbar/UrlbarPrefs.jsm
@@ -12,7 +12,6 @@
var EXPORTED_SYMBOLS = ["UrlbarPrefs", "UrlbarPrefsObserver"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/components/urlbar/UrlbarProviderExtension.jsm b/browser/components/urlbar/UrlbarProviderExtension.jsm
index 47a82bc82f637..02d22537e77df 100644
--- a/browser/components/urlbar/UrlbarProviderExtension.jsm
+++ b/browser/components/urlbar/UrlbarProviderExtension.jsm
@@ -14,7 +14,6 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderExtension"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { SkippableTimer, UrlbarProvider, UrlbarUtils } = ChromeUtils.import(
"resource:///modules/UrlbarUtils.jsm"
diff --git a/browser/components/urlbar/UrlbarProviderHeuristicFallback.jsm b/browser/components/urlbar/UrlbarProviderHeuristicFallback.jsm
index d860c1c84382d..b35d08df1d9a0 100644
--- a/browser/components/urlbar/UrlbarProviderHeuristicFallback.jsm
+++ b/browser/components/urlbar/UrlbarProviderHeuristicFallback.jsm
@@ -15,7 +15,6 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderHeuristicFallback"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import(
"resource:///modules/UrlbarUtils.jsm"
diff --git a/browser/components/urlbar/UrlbarProviderInterventions.jsm b/browser/components/urlbar/UrlbarProviderInterventions.jsm
index 392fb53949459..cb031edafa720 100644
--- a/browser/components/urlbar/UrlbarProviderInterventions.jsm
+++ b/browser/components/urlbar/UrlbarProviderInterventions.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderInterventions", "QueryScorer"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import(
"resource:///modules/UrlbarUtils.jsm"
diff --git a/browser/components/urlbar/UrlbarProviderPlaces.jsm b/browser/components/urlbar/UrlbarProviderPlaces.jsm
index 6ba8ffaf474b6..398bec40a4e7e 100644
--- a/browser/components/urlbar/UrlbarProviderPlaces.jsm
+++ b/browser/components/urlbar/UrlbarProviderPlaces.jsm
@@ -101,7 +101,6 @@ const SQL_SWITCHTAB_QUERY = `SELECT :query_type, t.url, t.url, NULL, NULL, NULL,
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import(
"resource:///modules/UrlbarUtils.jsm"
diff --git a/browser/components/urlbar/UrlbarProviderPreloadedSites.jsm b/browser/components/urlbar/UrlbarProviderPreloadedSites.jsm
index 20ed204b6a717..7c73350f2f2a2 100644
--- a/browser/components/urlbar/UrlbarProviderPreloadedSites.jsm
+++ b/browser/components/urlbar/UrlbarProviderPreloadedSites.jsm
@@ -15,7 +15,6 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderPreloadedSites"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import(
"resource:///modules/UrlbarUtils.jsm"
diff --git a/browser/components/urlbar/UrlbarProviderPrivateSearch.jsm b/browser/components/urlbar/UrlbarProviderPrivateSearch.jsm
index b02736eb4f9b9..d152e689bda2f 100644
--- a/browser/components/urlbar/UrlbarProviderPrivateSearch.jsm
+++ b/browser/components/urlbar/UrlbarProviderPrivateSearch.jsm
@@ -13,7 +13,6 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderPrivateSearch"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { SkippableTimer, UrlbarProvider, UrlbarUtils } = ChromeUtils.import(
"resource:///modules/UrlbarUtils.jsm"
diff --git a/browser/components/urlbar/UrlbarProviderQuickActions.jsm b/browser/components/urlbar/UrlbarProviderQuickActions.jsm
index 180e2774fa767..2d0cb126f91de 100644
--- a/browser/components/urlbar/UrlbarProviderQuickActions.jsm
+++ b/browser/components/urlbar/UrlbarProviderQuickActions.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderQuickActions"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import(
"resource:///modules/UrlbarUtils.jsm"
);
diff --git a/browser/components/urlbar/UrlbarProviderQuickSuggest.jsm b/browser/components/urlbar/UrlbarProviderQuickSuggest.jsm
index dced9f491a43e..cec78cbe61749 100644
--- a/browser/components/urlbar/UrlbarProviderQuickSuggest.jsm
+++ b/browser/components/urlbar/UrlbarProviderQuickSuggest.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderQuickSuggest", "QUICK_SUGGEST_SOURCE"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const {
SkippableTimer,
diff --git a/browser/components/urlbar/UrlbarProviderRemoteTabs.jsm b/browser/components/urlbar/UrlbarProviderRemoteTabs.jsm
index a5429dc7c0a50..b55cf7b13e95b 100644
--- a/browser/components/urlbar/UrlbarProviderRemoteTabs.jsm
+++ b/browser/components/urlbar/UrlbarProviderRemoteTabs.jsm
@@ -13,7 +13,6 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderRemoteTabs"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import(
"resource:///modules/UrlbarUtils.jsm"
diff --git a/browser/components/urlbar/UrlbarProviderSearchSuggestions.jsm b/browser/components/urlbar/UrlbarProviderSearchSuggestions.jsm
index 76830475fcd5a..c36ccd65db0e8 100644
--- a/browser/components/urlbar/UrlbarProviderSearchSuggestions.jsm
+++ b/browser/components/urlbar/UrlbarProviderSearchSuggestions.jsm
@@ -13,7 +13,6 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderSearchSuggestions"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { SkippableTimer, UrlbarProvider, UrlbarUtils } = ChromeUtils.import(
"resource:///modules/UrlbarUtils.jsm"
diff --git a/browser/components/urlbar/UrlbarProviderSearchTips.jsm b/browser/components/urlbar/UrlbarProviderSearchTips.jsm
index d33e5f18a9481..92378e61e841f 100644
--- a/browser/components/urlbar/UrlbarProviderSearchTips.jsm
+++ b/browser/components/urlbar/UrlbarProviderSearchTips.jsm
@@ -14,7 +14,6 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderSearchTips"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import(
"resource:///modules/UrlbarUtils.jsm"
diff --git a/browser/components/urlbar/UrlbarProviderTabToSearch.jsm b/browser/components/urlbar/UrlbarProviderTabToSearch.jsm
index e343cf2f19615..9edfe64fb4bac 100644
--- a/browser/components/urlbar/UrlbarProviderTabToSearch.jsm
+++ b/browser/components/urlbar/UrlbarProviderTabToSearch.jsm
@@ -14,7 +14,6 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderTabToSearch"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import(
"resource:///modules/UrlbarUtils.jsm"
diff --git a/browser/components/urlbar/UrlbarProviderTopSites.jsm b/browser/components/urlbar/UrlbarProviderTopSites.jsm
index f25a4cd457e58..6eafdb8fc715a 100644
--- a/browser/components/urlbar/UrlbarProviderTopSites.jsm
+++ b/browser/components/urlbar/UrlbarProviderTopSites.jsm
@@ -13,7 +13,6 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderTopSites"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import(
"resource:///modules/UrlbarUtils.jsm"
diff --git a/browser/components/urlbar/UrlbarQuickSuggest.jsm b/browser/components/urlbar/UrlbarQuickSuggest.jsm
index 052488e3cb0c7..22ce4796ee988 100644
--- a/browser/components/urlbar/UrlbarQuickSuggest.jsm
+++ b/browser/components/urlbar/UrlbarQuickSuggest.jsm
@@ -9,7 +9,6 @@ const EXPORTED_SYMBOLS = ["ONBOARDING_CHOICE", "UrlbarQuickSuggest"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { EventEmitter } = ChromeUtils.import(
"resource://gre/modules/EventEmitter.jsm"
diff --git a/browser/components/urlbar/UrlbarSearchOneOffs.jsm b/browser/components/urlbar/UrlbarSearchOneOffs.jsm
index 46243ea98022c..f958172106254 100644
--- a/browser/components/urlbar/UrlbarSearchOneOffs.jsm
+++ b/browser/components/urlbar/UrlbarSearchOneOffs.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["UrlbarSearchOneOffs"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { SearchOneOffs } = ChromeUtils.import(
"resource:///modules/SearchOneOffs.jsm"
diff --git a/browser/components/urlbar/UrlbarSearchUtils.jsm b/browser/components/urlbar/UrlbarSearchUtils.jsm
index 6e00662fb454c..2481305862e4b 100644
--- a/browser/components/urlbar/UrlbarSearchUtils.jsm
+++ b/browser/components/urlbar/UrlbarSearchUtils.jsm
@@ -16,7 +16,6 @@ var EXPORTED_SYMBOLS = ["UrlbarSearchUtils"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/urlbar/UrlbarTokenizer.jsm b/browser/components/urlbar/UrlbarTokenizer.jsm
index 58b633d22fea9..d97509f106d74 100644
--- a/browser/components/urlbar/UrlbarTokenizer.jsm
+++ b/browser/components/urlbar/UrlbarTokenizer.jsm
@@ -15,7 +15,7 @@ var EXPORTED_SYMBOLS = ["UrlbarTokenizer"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
diff --git a/browser/components/urlbar/UrlbarUtils.jsm b/browser/components/urlbar/UrlbarUtils.jsm
index 970b6543c452b..73d8e26ab224b 100644
--- a/browser/components/urlbar/UrlbarUtils.jsm
+++ b/browser/components/urlbar/UrlbarUtils.jsm
@@ -22,7 +22,7 @@ var EXPORTED_SYMBOLS = [
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
diff --git a/browser/components/urlbar/UrlbarValueFormatter.jsm b/browser/components/urlbar/UrlbarValueFormatter.jsm
index 66a766b32e33d..741a868f9c3e7 100644
--- a/browser/components/urlbar/UrlbarValueFormatter.jsm
+++ b/browser/components/urlbar/UrlbarValueFormatter.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["UrlbarValueFormatter"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/components/urlbar/UrlbarView.jsm b/browser/components/urlbar/UrlbarView.jsm
index 298e88b955094..98fc23ecbe9dd 100644
--- a/browser/components/urlbar/UrlbarView.jsm
+++ b/browser/components/urlbar/UrlbarView.jsm
@@ -9,7 +9,7 @@ var EXPORTED_SYMBOLS = ["UrlbarView"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
diff --git a/browser/components/urlbar/tests/UrlbarTestUtils.jsm b/browser/components/urlbar/tests/UrlbarTestUtils.jsm
index 36e51ffa29dd2..7b2a48f7c3f64 100644
--- a/browser/components/urlbar/tests/UrlbarTestUtils.jsm
+++ b/browser/components/urlbar/tests/UrlbarTestUtils.jsm
@@ -8,7 +8,6 @@ const EXPORTED_SYMBOLS = ["UrlbarTestUtils"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.jsm b/browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.jsm
index 35a7c2b666c74..97069b44de579 100644
--- a/browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.jsm
+++ b/browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.jsm
@@ -8,7 +8,6 @@ const EXPORTED_SYMBOLS = ["QuickSuggestTestUtils"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const {
CONTEXTUAL_SERVICES_PING_TYPES,
diff --git a/browser/extensions/report-site-issue/experimentalAPIs/actors/tabExtrasActor.jsm b/browser/extensions/report-site-issue/experimentalAPIs/actors/tabExtrasActor.jsm
index 6ea8d6068901e..9e9341d369932 100644
--- a/browser/extensions/report-site-issue/experimentalAPIs/actors/tabExtrasActor.jsm
+++ b/browser/extensions/report-site-issue/experimentalAPIs/actors/tabExtrasActor.jsm
@@ -5,8 +5,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
// Bug 1777268 - This is currently not available in the globals, but we
// may consider adding it.
// eslint-disable-next-line mozilla/reject-importGlobalProperties
diff --git a/browser/extensions/webcompat/about-compat/AboutCompat.jsm b/browser/extensions/webcompat/about-compat/AboutCompat.jsm
index d5c225f37c891..2993bf46d6e64 100644
--- a/browser/extensions/webcompat/about-compat/AboutCompat.jsm
+++ b/browser/extensions/webcompat/about-compat/AboutCompat.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["AboutCompat"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const addonID = "webcompat@mozilla.org";
const addonPageRelativeURL = "/about-compat/aboutCompat.html";
diff --git a/browser/modules/AboutNewTab.jsm b/browser/modules/AboutNewTab.jsm
index 02d080349b0e4..4a544b0c1db8c 100644
--- a/browser/modules/AboutNewTab.jsm
+++ b/browser/modules/AboutNewTab.jsm
@@ -11,7 +11,6 @@ const { AppConstants } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/modules/AppUpdater.jsm b/browser/modules/AppUpdater.jsm
index 296373ff6702d..cb375ca98b146 100644
--- a/browser/modules/AppUpdater.jsm
+++ b/browser/modules/AppUpdater.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["AppUpdater"];
var { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/modules/AsyncTabSwitcher.jsm b/browser/modules/AsyncTabSwitcher.jsm
index 43ef29460ce02..3df57b9066551 100644
--- a/browser/modules/AsyncTabSwitcher.jsm
+++ b/browser/modules/AsyncTabSwitcher.jsm
@@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = ["AsyncTabSwitcher"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/modules/BrowserUsageTelemetry.jsm b/browser/modules/BrowserUsageTelemetry.jsm
index 00b19ebdbecf5..13a840edd6aed 100644
--- a/browser/modules/BrowserUsageTelemetry.jsm
+++ b/browser/modules/BrowserUsageTelemetry.jsm
@@ -15,7 +15,6 @@ var EXPORTED_SYMBOLS = [
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/modules/BrowserWindowTracker.jsm b/browser/modules/BrowserWindowTracker.jsm
index cbcb6ccd4dbf8..f0bc44ce89ce5 100644
--- a/browser/modules/BrowserWindowTracker.jsm
+++ b/browser/modules/BrowserWindowTracker.jsm
@@ -12,7 +12,6 @@ var EXPORTED_SYMBOLS = ["BrowserWindowTracker"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/modules/ContentCrashHandlers.jsm b/browser/modules/ContentCrashHandlers.jsm
index bf281cc29a32d..7314ca87b2ee5 100644
--- a/browser/modules/ContentCrashHandlers.jsm
+++ b/browser/modules/ContentCrashHandlers.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["TabCrashHandler", "UnsubmittedCrashHandler"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/modules/Discovery.jsm b/browser/modules/Discovery.jsm
index a2da71a012863..92a1d6ff06bbc 100644
--- a/browser/modules/Discovery.jsm
+++ b/browser/modules/Discovery.jsm
@@ -8,7 +8,6 @@ var EXPORTED_SYMBOLS = ["Discovery"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/modules/EveryWindow.jsm b/browser/modules/EveryWindow.jsm
index 052ae2322166f..4a67db57a019b 100644
--- a/browser/modules/EveryWindow.jsm
+++ b/browser/modules/EveryWindow.jsm
@@ -28,8 +28,6 @@ var EXPORTED_SYMBOLS = ["EveryWindow"];
* If the window is closing, a second argument is passed with value `true`.
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var initialized = false;
var callbacks = new Map();
diff --git a/browser/modules/ExtensionsUI.jsm b/browser/modules/ExtensionsUI.jsm
index 5988e1131c023..25a3a193770d3 100644
--- a/browser/modules/ExtensionsUI.jsm
+++ b/browser/modules/ExtensionsUI.jsm
@@ -11,7 +11,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { EventEmitter } = ChromeUtils.import(
"resource://gre/modules/EventEmitter.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/modules/FaviconLoader.jsm b/browser/modules/FaviconLoader.jsm
index 4c4eef06ca9ff..8f7c0343722d0 100644
--- a/browser/modules/FaviconLoader.jsm
+++ b/browser/modules/FaviconLoader.jsm
@@ -6,8 +6,6 @@
const EXPORTED_SYMBOLS = ["FaviconLoader"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/browser/modules/HomePage.jsm b/browser/modules/HomePage.jsm
index 5a21f7067ec36..6583e37c280d9 100644
--- a/browser/modules/HomePage.jsm
+++ b/browser/modules/HomePage.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["HomePage"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/modules/LaterRun.jsm b/browser/modules/LaterRun.jsm
index f6c68c7efcde6..74b96506db1f7 100644
--- a/browser/modules/LaterRun.jsm
+++ b/browser/modules/LaterRun.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["LaterRun"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const kEnabledPref = "browser.laterrun.enabled";
const kPagePrefRoot = "browser.laterrun.pages.";
// Number of sessions we've been active in
diff --git a/browser/modules/NewTabPagePreloading.jsm b/browser/modules/NewTabPagePreloading.jsm
index 0ee6e146272f5..1b23156bb342e 100644
--- a/browser/modules/NewTabPagePreloading.jsm
+++ b/browser/modules/NewTabPagePreloading.jsm
@@ -12,7 +12,6 @@ var EXPORTED_SYMBOLS = ["NewTabPagePreloading"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/modules/OpenInTabsUtils.jsm b/browser/modules/OpenInTabsUtils.jsm
index e4fcfe9d185f5..ba6e6e022540b 100644
--- a/browser/modules/OpenInTabsUtils.jsm
+++ b/browser/modules/OpenInTabsUtils.jsm
@@ -9,7 +9,6 @@ const EXPORTED_SYMBOLS = ["OpenInTabsUtils"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/modules/PageActions.jsm b/browser/modules/PageActions.jsm
index 658495f78bfe8..a522d9a8b0a23 100644
--- a/browser/modules/PageActions.jsm
+++ b/browser/modules/PageActions.jsm
@@ -15,7 +15,6 @@ var EXPORTED_SYMBOLS = [
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/modules/PartnerLinkAttribution.jsm b/browser/modules/PartnerLinkAttribution.jsm
index 1d8b2b8af5e7e..5792189bf2a8b 100644
--- a/browser/modules/PartnerLinkAttribution.jsm
+++ b/browser/modules/PartnerLinkAttribution.jsm
@@ -12,7 +12,6 @@ var EXPORTED_SYMBOLS = [
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/modules/PermissionUI.jsm b/browser/modules/PermissionUI.jsm
index 9d088a3e26464..c91e2f3035490 100644
--- a/browser/modules/PermissionUI.jsm
+++ b/browser/modules/PermissionUI.jsm
@@ -64,7 +64,6 @@ var EXPORTED_SYMBOLS = ["PermissionUI"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/browser/modules/PingCentre.jsm b/browser/modules/PingCentre.jsm
index f7f56d26c1b86..398c465661e97 100644
--- a/browser/modules/PingCentre.jsm
+++ b/browser/modules/PingCentre.jsm
@@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/modules/ProcessHangMonitor.jsm b/browser/modules/ProcessHangMonitor.jsm
index c274e055c8729..9d0899d81cb34 100644
--- a/browser/modules/ProcessHangMonitor.jsm
+++ b/browser/modules/ProcessHangMonitor.jsm
@@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = ["ProcessHangMonitor"];
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
/**
* Elides the middle of a string by replacing it with an elipsis if it is
diff --git a/browser/modules/Sanitizer.jsm b/browser/modules/Sanitizer.jsm
index a48f041a5b446..2fe2f16dc049e 100644
--- a/browser/modules/Sanitizer.jsm
+++ b/browser/modules/Sanitizer.jsm
@@ -8,7 +8,6 @@ var EXPORTED_SYMBOLS = ["Sanitizer"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/browser/modules/SiteDataManager.jsm b/browser/modules/SiteDataManager.jsm
index 0bcd2d37decf0..cf9e20c5970a2 100644
--- a/browser/modules/SiteDataManager.jsm
+++ b/browser/modules/SiteDataManager.jsm
@@ -7,7 +7,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var EXPORTED_SYMBOLS = ["SiteDataManager"];
diff --git a/browser/modules/SitePermissions.jsm b/browser/modules/SitePermissions.jsm
index 3c6d204c11cb6..0c8bdb5e609de 100644
--- a/browser/modules/SitePermissions.jsm
+++ b/browser/modules/SitePermissions.jsm
@@ -4,7 +4,6 @@
var EXPORTED_SYMBOLS = ["SitePermissions"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/modules/TabUnloader.jsm b/browser/modules/TabUnloader.jsm
index 34b2e89e8683b..54045b700c436 100644
--- a/browser/modules/TabUnloader.jsm
+++ b/browser/modules/TabUnloader.jsm
@@ -13,8 +13,6 @@
*/
var EXPORTED_SYMBOLS = ["TabUnloader"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/browser/modules/WindowsJumpLists.jsm b/browser/modules/WindowsJumpLists.jsm
index a6e21b4a3bb86..b6f315e1827df 100644
--- a/browser/modules/WindowsJumpLists.jsm
+++ b/browser/modules/WindowsJumpLists.jsm
@@ -6,7 +6,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Stop updating jumplists after some idle time.
const IDLE_TIMEOUT_SECONDS = 5 * 60;
diff --git a/browser/modules/WindowsPreviewPerTab.jsm b/browser/modules/WindowsPreviewPerTab.jsm
index 5fc08511ac6d4..8408d3f531433 100644
--- a/browser/modules/WindowsPreviewPerTab.jsm
+++ b/browser/modules/WindowsPreviewPerTab.jsm
@@ -50,7 +50,6 @@ const { PlacesUtils } = ChromeUtils.import(
const { PrivateBrowsingUtils } = ChromeUtils.import(
"resource://gre/modules/PrivateBrowsingUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/modules/ZoomUI.jsm b/browser/modules/ZoomUI.jsm
index 4012fbaa281ef..c50e95eb1fa5a 100644
--- a/browser/modules/ZoomUI.jsm
+++ b/browser/modules/ZoomUI.jsm
@@ -10,7 +10,6 @@ const gLoadContext = Cu.createLoadContext();
const gContentPrefs = Cc["@mozilla.org/content-pref/service;1"].getService(
Ci.nsIContentPrefService2
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const gZoomPropertyName = "browser.content.full-zoom";
const lazy = {};
diff --git a/browser/modules/webrtcUI.jsm b/browser/modules/webrtcUI.jsm
index 92c49dcae4df3..dee7743c7de63 100644
--- a/browser/modules/webrtcUI.jsm
+++ b/browser/modules/webrtcUI.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["webrtcUI", "MacOSWebRTCStatusbarIndicator"];
const { EventEmitter } = ChromeUtils.import(
"resource:///modules/syncedtabs/EventEmitter.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/browser/themes/BuiltInThemeConfig.jsm b/browser/themes/BuiltInThemeConfig.jsm
index de07727f1ff5a..8a203d6d24728 100644
--- a/browser/themes/BuiltInThemeConfig.jsm
+++ b/browser/themes/BuiltInThemeConfig.jsm
@@ -9,7 +9,6 @@ const EXPORTED_SYMBOLS = ["_applyColorwayConfig", "BuiltInThemeConfig"];
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
/**
* A Map of themes built in to the browser, alongwith a Map of collections those themes belong to. Params for the objects contained
diff --git a/browser/themes/BuiltInThemes.jsm b/browser/themes/BuiltInThemes.jsm
index baf57fe5af968..f65fc75560b4b 100644
--- a/browser/themes/BuiltInThemes.jsm
+++ b/browser/themes/BuiltInThemes.jsm
@@ -7,7 +7,6 @@ var EXPORTED_SYMBOLS = ["BuiltInThemes"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/browser/themes/ThemeVariableMap.jsm b/browser/themes/ThemeVariableMap.jsm
index fa2b0b1778efe..4edac436a1bb8 100644
--- a/browser/themes/ThemeVariableMap.jsm
+++ b/browser/themes/ThemeVariableMap.jsm
@@ -4,8 +4,6 @@
var EXPORTED_SYMBOLS = ["ThemeVariableMap", "ThemeContentPropertyList"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const ThemeVariableMap = [
[
"--lwt-accent-color-inactive",
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm
index f9486753b7dbb..5e4cbac8666d1 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["Screenshot"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
index 86f6f0877f88d..161fedd4326af 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
@@ -15,7 +15,6 @@ const HOME_PAGE = "resource://mozscreenshots/lib/mozscreenshots.html";
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
const { Rect } = ChromeUtils.import("resource://gre/modules/Geometry.jsm");
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/AppMenu.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/AppMenu.jsm
index c6305faad7897..03838800a7c5e 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/AppMenu.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/AppMenu.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["AppMenu"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { BrowserTestUtils } = ChromeUtils.import(
"resource://testing-common/BrowserTestUtils.jsm"
);
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Buttons.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Buttons.jsm
index e2cfb13db367a..95c8e9b0e5402 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Buttons.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Buttons.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["Buttons"];
const { CustomizableUI } = ChromeUtils.import(
"resource:///modules/CustomizableUI.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var Buttons = {
init(libDir) {
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
index d1a328842bcc5..b8f761cd45701 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["ControlCenter"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
const { BrowserTestUtils } = ChromeUtils.import(
"resource://testing-common/BrowserTestUtils.jsm"
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/CustomizeMode.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/CustomizeMode.jsm
index cf3c9f3ed2067..31e8e066cd2e2 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/CustomizeMode.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/CustomizeMode.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["CustomizeMode"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
var CustomizeMode = {
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.jsm
index 5b65bdea69110..e8d662d5ead60 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.jsm
@@ -10,7 +10,6 @@ const { require } = ChromeUtils.import(
"resource://devtools/shared/loader/Loader.jsm"
);
const { gDevTools } = require("devtools/client/framework/devtools");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
async function showToolboxForSelectedTab(toolId, hostType) {
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
index 9bdf1d7da1e85..20554d72e8a72 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["PermissionPrompts"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { BrowserTestUtils } = ChromeUtils.import(
"resource://testing-common/BrowserTestUtils.jsm"
);
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
index 19fe42b03467e..902898c104e5c 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["Preferences"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
);
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm
index be8d65a774f1f..327639955e397 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm
@@ -10,7 +10,6 @@ const CUST_TAB = "chrome://browser/skin/customize.svg";
const PREFS_TAB = "chrome://global/skin/icons/settings.svg";
const DEFAULT_FAVICON_TAB = `data:text/html,<meta%20charset="utf-8"><title>No%20favicon</title>`;
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/TabsInTitlebar.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/TabsInTitlebar.jsm
index 79a8ec9aa638e..b271d6be2894c 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/TabsInTitlebar.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/TabsInTitlebar.jsm
@@ -8,8 +8,6 @@ var EXPORTED_SYMBOLS = ["TabsInTitlebar"];
const PREF_TABS_IN_TITLEBAR = "browser.tabs.inTitlebar";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var TabsInTitlebar = {
init(libDir) {},
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.jsm
index 349a73be0c7de..e3fea231c1755 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["Toolbars"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var Toolbars = {
init(libDir) {},
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/UIDensities.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/UIDensities.jsm
index aea09d822cd14..a47212317e85d 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/UIDensities.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/UIDensities.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["UIDensities"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var UIDensities = {
init(libDir) {},
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/WindowSize.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/WindowSize.jsm
index 80abed1d15afa..cdac1ab921c5e 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/WindowSize.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/WindowSize.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["WindowSize"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
const { BrowserTestUtils } = ChromeUtils.import(
"resource://testing-common/BrowserTestUtils.jsm"
diff --git a/devtools/server/actors/targets/target-actor-registry.jsm b/devtools/server/actors/targets/target-actor-registry.jsm
index bb8841bb56b1d..048fa4cc599b3 100644
--- a/devtools/server/actors/targets/target-actor-registry.jsm
+++ b/devtools/server/actors/targets/target-actor-registry.jsm
@@ -4,8 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var EXPORTED_SYMBOLS = ["TargetActorRegistry"];
// Keep track of all WindowGlobal target actors.
diff --git a/devtools/server/actors/watcher/WatcherRegistry.jsm b/devtools/server/actors/watcher/WatcherRegistry.jsm
index 0663a97c82cd6..bc28eca762552 100644
--- a/devtools/server/actors/watcher/WatcherRegistry.jsm
+++ b/devtools/server/actors/watcher/WatcherRegistry.jsm
@@ -28,7 +28,6 @@
var EXPORTED_SYMBOLS = ["WatcherRegistry"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { ActorManagerParent } = ChromeUtils.import(
"resource://gre/modules/ActorManagerParent.jsm"
);
diff --git a/devtools/server/actors/watcher/browsing-context-helpers.jsm b/devtools/server/actors/watcher/browsing-context-helpers.jsm
index 5291a9294f5c2..5b6f20719a485 100644
--- a/devtools/server/actors/watcher/browsing-context-helpers.jsm
+++ b/devtools/server/actors/watcher/browsing-context-helpers.jsm
@@ -11,16 +11,6 @@ const EXPORTED_SYMBOLS = [
"getAllBrowsingContextsForContext",
];
-let Services;
-if (typeof module == "object") {
- // Allow this JSM to also be loaded as a CommonJS module
- // eslint-disable-next-line no-global-assign
- Services = require("Services");
-} else {
- // eslint-disable-next-line no-global-assign
- ({ Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"));
-}
-
const isEveryFrameTargetEnabled = Services.prefs.getBoolPref(
"devtools.every-frame-target.enabled",
false
diff --git a/devtools/server/connectors/js-window-actor/DevToolsFrameChild.jsm b/devtools/server/connectors/js-window-actor/DevToolsFrameChild.jsm
index eaaff13358b0e..b5669a681261c 100644
--- a/devtools/server/connectors/js-window-actor/DevToolsFrameChild.jsm
+++ b/devtools/server/connectors/js-window-actor/DevToolsFrameChild.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["DevToolsFrameChild"];
const { EventEmitter } = ChromeUtils.import(
"resource://gre/modules/EventEmitter.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const Loader = ChromeUtils.import(
"resource://devtools/shared/loader/Loader.jsm"
);
diff --git a/devtools/server/connectors/js-window-actor/DevToolsWorkerChild.jsm b/devtools/server/connectors/js-window-actor/DevToolsWorkerChild.jsm
index 3723cb11e93b5..36af372cf77a5 100644
--- a/devtools/server/connectors/js-window-actor/DevToolsWorkerChild.jsm
+++ b/devtools/server/connectors/js-window-actor/DevToolsWorkerChild.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["DevToolsWorkerChild"];
const { EventEmitter } = ChromeUtils.import(
"resource://gre/modules/EventEmitter.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/devtools/shared/loader/Loader.jsm b/devtools/shared/loader/Loader.jsm
index e4baada6c2fa1..3e68b8e76e06a 100644
--- a/devtools/shared/loader/Loader.jsm
+++ b/devtools/shared/loader/Loader.jsm
@@ -8,7 +8,6 @@
* Manages the base loader (base-loader.js) instance used to load the developer tools.
*/
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var { Loader, Require, resolveURI, unload } = ChromeUtils.import(
"resource://devtools/shared/loader/base-loader.js"
);
diff --git a/devtools/shared/security/DevToolsSocketStatus.jsm b/devtools/shared/security/DevToolsSocketStatus.jsm
index 33b7acf872b82..f73aa4d702f80 100644
--- a/devtools/shared/security/DevToolsSocketStatus.jsm
+++ b/devtools/shared/security/DevToolsSocketStatus.jsm
@@ -4,8 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
/**
* Singleton that should be updated whenever a socket is opened or closed for
* incoming connections.
diff --git a/devtools/startup/AboutDebuggingRegistration.jsm b/devtools/startup/AboutDebuggingRegistration.jsm
index bff589c0a545a..f2ced9bd12618 100644
--- a/devtools/startup/AboutDebuggingRegistration.jsm
+++ b/devtools/startup/AboutDebuggingRegistration.jsm
@@ -6,7 +6,6 @@
// Register the about:debugging URL, that allows to debug tabs, extensions, workers on
// the current instance of Firefox or on a remote Firefox.
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { nsIAboutModule } = Ci;
diff --git a/devtools/startup/AboutDevToolsToolboxRegistration.jsm b/devtools/startup/AboutDevToolsToolboxRegistration.jsm
index b68de6d0000ca..1448e84e57c61 100644
--- a/devtools/startup/AboutDevToolsToolboxRegistration.jsm
+++ b/devtools/startup/AboutDevToolsToolboxRegistration.jsm
@@ -7,8 +7,6 @@
// Register about:devtools-toolbox which allows to open a devtools toolbox
// in a Firefox tab or a custom html iframe in browser.html
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { nsIAboutModule } = Ci;
function AboutDevtoolsToolbox() {}
diff --git a/devtools/startup/DevToolsShim.jsm b/devtools/startup/DevToolsShim.jsm
index 45af176156a48..e2388b7cca50f 100644
--- a/devtools/startup/DevToolsShim.jsm
+++ b/devtools/startup/DevToolsShim.jsm
@@ -4,8 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/devtools/startup/DevToolsStartup.jsm b/devtools/startup/DevToolsStartup.jsm
index bf03e9a48016b..00a4b52aed848 100644
--- a/devtools/startup/DevToolsStartup.jsm
+++ b/devtools/startup/DevToolsStartup.jsm
@@ -34,7 +34,6 @@ const DEVTOOLS_POLICY_DISABLED_PREF = "devtools.policy.disabled";
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/docshell/base/URIFixup.jsm b/docshell/base/URIFixup.jsm
index 9411052c9326e..1a2861e30954e 100644
--- a/docshell/base/URIFixup.jsm
+++ b/docshell/base/URIFixup.jsm
@@ -21,7 +21,6 @@ var EXPORTED_SYMBOLS = ["URIFixup", "URIFixupInfo"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/dom/base/ContentAreaDropListener.jsm b/dom/base/ContentAreaDropListener.jsm
index 840389df24bca..476b2e983bf76 100644
--- a/dom/base/ContentAreaDropListener.jsm
+++ b/dom/base/ContentAreaDropListener.jsm
@@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
// This component is used for handling dragover and drop of urls.
//
// It checks to see whether a drop of a url is allowed. For instance, a url
diff --git a/dom/base/DOMRequestHelper.jsm b/dom/base/DOMRequestHelper.jsm
index 3f0b348d78f2e..04ae441adee4c 100644
--- a/dom/base/DOMRequestHelper.jsm
+++ b/dom/base/DOMRequestHelper.jsm
@@ -18,8 +18,6 @@
*/
var EXPORTED_SYMBOLS = ["DOMRequestIpcHelper"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
function DOMRequestIpcHelper() {
// _listeners keeps a list of messages for which we added a listener and the
// kind of listener that we added (strong or weak). It's an object of this
diff --git a/dom/base/IndexedDBHelper.jsm b/dom/base/IndexedDBHelper.jsm
index 3fd70668b115b..60746321c5687 100644
--- a/dom/base/IndexedDBHelper.jsm
+++ b/dom/base/IndexedDBHelper.jsm
@@ -16,8 +16,6 @@ if (DEBUG) {
var EXPORTED_SYMBOLS = ["IndexedDBHelper"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
function getErrorName(err) {
return (err && err.name) || "UnknownError";
}
diff --git a/dom/bindings/test/TestInterfaceJS.jsm b/dom/bindings/test/TestInterfaceJS.jsm
index 0ec6f0df3a04b..fd0284d50d0dd 100644
--- a/dom/bindings/test/TestInterfaceJS.jsm
+++ b/dom/bindings/test/TestInterfaceJS.jsm
@@ -8,8 +8,6 @@
var EXPORTED_SYMBOLS = ["TestInterfaceJS"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
function TestInterfaceJS() {}
TestInterfaceJS.prototype = {
diff --git a/dom/browser-element/BrowserElementParent.jsm b/dom/browser-element/BrowserElementParent.jsm
index 73d528456e17f..ec342dace2ad1 100644
--- a/dom/browser-element/BrowserElementParent.jsm
+++ b/dom/browser-element/BrowserElementParent.jsm
@@ -9,7 +9,6 @@
* appropriate action here in the parent.
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { BrowserElementPromptService } = ChromeUtils.import(
"resource://gre/modules/BrowserElementPromptService.jsm"
);
diff --git a/dom/browser-element/BrowserElementPromptService.jsm b/dom/browser-element/BrowserElementPromptService.jsm
index 628de0730ed6c..232a935564c56 100644
--- a/dom/browser-element/BrowserElementPromptService.jsm
+++ b/dom/browser-element/BrowserElementPromptService.jsm
@@ -9,8 +9,6 @@ var Cm = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
var EXPORTED_SYMBOLS = ["BrowserElementPromptService"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
function debug(msg) {
// dump("BrowserElementPromptService - " + msg + "\n");
}
diff --git a/dom/console/ConsoleAPIStorage.jsm b/dom/console/ConsoleAPIStorage.jsm
index 847eeaf68f7dd..e3b44e883a099 100644
--- a/dom/console/ConsoleAPIStorage.jsm
+++ b/dom/console/ConsoleAPIStorage.jsm
@@ -4,8 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const STORAGE_MAX_EVENTS = 1000;
var _consoleStorage = new Map();
diff --git a/dom/ipc/tests/JSProcessActor/browser_sendQuery.js b/dom/ipc/tests/JSProcessActor/browser_sendQuery.js
index b19e66ee91909..2fae5154c5cb4 100644
--- a/dom/ipc/tests/JSProcessActor/browser_sendQuery.js
+++ b/dom/ipc/tests/JSProcessActor/browser_sendQuery.js
@@ -3,8 +3,8 @@
"use strict";
const ERROR_LINE_NUMBERS = {
- jsm: 33,
- "sys.mjs": 31,
+ jsm: 31,
+ "sys.mjs": 29,
};
const EXCEPTION_LINE_NUMBERS = {
jsm: ERROR_LINE_NUMBERS.jsm + 3,
diff --git a/dom/ipc/tests/JSWindowActor/browser_sendQuery.js b/dom/ipc/tests/JSWindowActor/browser_sendQuery.js
index 6409546a1141b..cd1104e1a8fef 100644
--- a/dom/ipc/tests/JSWindowActor/browser_sendQuery.js
+++ b/dom/ipc/tests/JSWindowActor/browser_sendQuery.js
@@ -3,8 +3,8 @@
"use strict";
const ERROR_LINE_NUMBERS = {
- jsm: 41,
- "sys.mjs": 39,
+ jsm: 39,
+ "sys.mjs": 37,
};
const EXCEPTION_LINE_NUMBERS = {
jsm: ERROR_LINE_NUMBERS.jsm + 3,
diff --git a/dom/manifest/ImageObjectProcessor.jsm b/dom/manifest/ImageObjectProcessor.jsm
index bba84f2a6c964..7ad8f52b2c948 100644
--- a/dom/manifest/ImageObjectProcessor.jsm
+++ b/dom/manifest/ImageObjectProcessor.jsm
@@ -20,8 +20,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
function ImageObjectProcessor(aErrors, aExtractor, aBundle) {
this.errors = aErrors;
this.extractor = aExtractor;
diff --git a/dom/manifest/ManifestObtainer.jsm b/dom/manifest/ManifestObtainer.jsm
index 056defa5fe112..e477e495c38e3 100644
--- a/dom/manifest/ManifestObtainer.jsm
+++ b/dom/manifest/ManifestObtainer.jsm
@@ -23,8 +23,6 @@
*/
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { ManifestProcessor } = ChromeUtils.import(
"resource://gre/modules/ManifestProcessor.jsm"
);
diff --git a/dom/manifest/ManifestProcessor.jsm b/dom/manifest/ManifestProcessor.jsm
index 466f89909cc8d..a7018087bb0cb 100644
--- a/dom/manifest/ManifestProcessor.jsm
+++ b/dom/manifest/ManifestProcessor.jsm
@@ -38,7 +38,6 @@ const orientationTypes = new Set([
]);
const textDirections = new Set(["ltr", "rtl", "auto"]);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
// ValueExtractor is used by the various processors to get values
// from the manifest and to report errors.
const { ValueExtractor } = ChromeUtils.import(
diff --git a/dom/media/IdpSandbox.jsm b/dom/media/IdpSandbox.jsm
index b407a14ee025c..633dd35f8363d 100644
--- a/dom/media/IdpSandbox.jsm
+++ b/dom/media/IdpSandbox.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
/** This little class ensures that redirects maintain an https:// origin */
diff --git a/dom/media/PeerConnection.jsm b/dom/media/PeerConnection.jsm
index 45318449b1f9b..4ed9bb83eea3f 100644
--- a/dom/media/PeerConnection.jsm
+++ b/dom/media/PeerConnection.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/dom/media/webvtt/vtt.jsm b/dom/media/webvtt/vtt.jsm
index a0093fbf51e42..37eb71ae1ee36 100644
--- a/dom/media/webvtt/vtt.jsm
+++ b/dom/media/webvtt/vtt.jsm
@@ -27,7 +27,6 @@ var EXPORTED_SYMBOLS = ["WebVTT"];
* limitations under the License.
*/
-const {Services} = ChromeUtils.import('resource://gre/modules/Services.jsm');
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyPreferenceGetter(this, "supportPseudo",
diff --git a/dom/notification/NotificationStorage.jsm b/dom/notification/NotificationStorage.jsm
index a634638c63024..fb282447abddc 100644
--- a/dom/notification/NotificationStorage.jsm
+++ b/dom/notification/NotificationStorage.jsm
@@ -9,8 +9,6 @@ function debug(s) {
dump("-*- NotificationStorage.js: " + s + "\n");
}
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const kMessageNotificationGetAllOk = "Notification:GetAll:Return:OK";
const kMessageNotificationGetAllKo = "Notification:GetAll:Return:KO";
const kMessageNotificationSaveKo = "Notification:Save:Return:KO";
diff --git a/dom/notification/new/NotificationDB.jsm b/dom/notification/new/NotificationDB.jsm
index a07379964d099..cf22297a678f0 100644
--- a/dom/notification/new/NotificationDB.jsm
+++ b/dom/notification/new/NotificationDB.jsm
@@ -23,7 +23,6 @@ ChromeUtils.defineModuleGetter(
"KeyValueService",
"resource://gre/modules/kvstore.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const kMessages = [
"Notification:Save",
diff --git a/dom/notification/old/NotificationDB.jsm b/dom/notification/old/NotificationDB.jsm
index b5b716f9f3f52..fb6d0e9cd3c98 100644
--- a/dom/notification/old/NotificationDB.jsm
+++ b/dom/notification/old/NotificationDB.jsm
@@ -11,8 +11,6 @@ function debug(s) {
dump("-*- NotificationDB component: " + s + "\n");
}
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const NOTIFICATION_STORE_DIR = PathUtils.profileDir;
const NOTIFICATION_STORE_PATH = PathUtils.join(
NOTIFICATION_STORE_DIR,
diff --git a/dom/push/Push.jsm b/dom/push/Push.jsm
index 2863b6297e1ea..ba5dd0955b126 100644
--- a/dom/push/Push.jsm
+++ b/dom/push/Push.jsm
@@ -7,7 +7,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { DOMRequestIpcHelper } = ChromeUtils.import(
"resource://gre/modules/DOMRequestHelper.jsm"
);
diff --git a/dom/push/PushComponents.jsm b/dom/push/PushComponents.jsm
index 1dfc7f29a32c4..cb3217d72660f 100644
--- a/dom/push/PushComponents.jsm
+++ b/dom/push/PushComponents.jsm
@@ -12,7 +12,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var isParent =
Services.appinfo.processType === Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
diff --git a/dom/push/PushCrypto.jsm b/dom/push/PushCrypto.jsm
index a1ace86a8c5ff..54855d5c47d4f 100644
--- a/dom/push/PushCrypto.jsm
+++ b/dom/push/PushCrypto.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/dom/push/PushRecord.jsm b/dom/push/PushRecord.jsm
index 9e3ab45437aaa..c07450b9abd0a 100644
--- a/dom/push/PushRecord.jsm
+++ b/dom/push/PushRecord.jsm
@@ -7,7 +7,6 @@
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/dom/push/PushService.jsm b/dom/push/PushService.jsm
index 5e6fc0e29c877..75761a5d45630 100644
--- a/dom/push/PushService.jsm
+++ b/dom/push/PushService.jsm
@@ -7,7 +7,6 @@
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { clearTimeout, setTimeout } = ChromeUtils.import(
"resource://gre/modules/Timer.jsm"
);
diff --git a/dom/push/PushServiceAndroidGCM.jsm b/dom/push/PushServiceAndroidGCM.jsm
index 5ebed784cd07a..19007d25c12f5 100644
--- a/dom/push/PushServiceAndroidGCM.jsm
+++ b/dom/push/PushServiceAndroidGCM.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/dom/push/PushServiceHttp2.jsm b/dom/push/PushServiceHttp2.jsm
index 6a4bb2e861a1e..be2d12eaac5c7 100644
--- a/dom/push/PushServiceHttp2.jsm
+++ b/dom/push/PushServiceHttp2.jsm
@@ -11,7 +11,6 @@ const { PushRecord } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
const { clearTimeout, setTimeout } = ChromeUtils.import(
"resource://gre/modules/Timer.jsm"
diff --git a/dom/push/PushServiceWebSocket.jsm b/dom/push/PushServiceWebSocket.jsm
index 8c53e49dfe43b..b9c3073a2a77c 100644
--- a/dom/push/PushServiceWebSocket.jsm
+++ b/dom/push/PushServiceWebSocket.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/dom/quota/test/modules/system/ModuleLoader.jsm b/dom/quota/test/modules/system/ModuleLoader.jsm
index ab6968d2700c4..6f1f99bb454b1 100644
--- a/dom/quota/test/modules/system/ModuleLoader.jsm
+++ b/dom/quota/test/modules/system/ModuleLoader.jsm
@@ -3,8 +3,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
function ModuleLoader(base, depth, proto) {
const modules = {};
diff --git a/dom/quota/test/modules/system/StorageUtils.jsm b/dom/quota/test/modules/system/StorageUtils.jsm
index 332c2bcd33ad7..767c4ecf2c003 100644
--- a/dom/quota/test/modules/system/StorageUtils.jsm
+++ b/dom/quota/test/modules/system/StorageUtils.jsm
@@ -3,8 +3,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
class RequestError extends Error {
constructor(resultCode, resultName) {
super(`Request failed (code: ${resultCode}, name: ${resultName})`);
diff --git a/dom/system/NetworkGeolocationProvider.jsm b/dom/system/NetworkGeolocationProvider.jsm
index 96724258c9ba7..ba183ea1d8692 100644
--- a/dom/system/NetworkGeolocationProvider.jsm
+++ b/dom/system/NetworkGeolocationProvider.jsm
@@ -7,7 +7,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/extensions/permissions/test/PermissionTestUtils.jsm b/extensions/permissions/test/PermissionTestUtils.jsm
index 1968d1697a411..5d36c31a4b70d 100644
--- a/extensions/permissions/test/PermissionTestUtils.jsm
+++ b/extensions/permissions/test/PermissionTestUtils.jsm
@@ -8,8 +8,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
let pm = Services.perms;
let secMan = Services.scriptSecurityManager;
diff --git a/intl/locale/LangPackMatcher.jsm b/intl/locale/LangPackMatcher.jsm
index ee40ccd0b0c7b..e5690c1ba26df 100644
--- a/intl/locale/LangPackMatcher.jsm
+++ b/intl/locale/LangPackMatcher.jsm
@@ -6,7 +6,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/intl/locale/PluralForm.jsm b/intl/locale/PluralForm.jsm
index cab11a492e3e4..7e240e059e5e1 100644
--- a/intl/locale/PluralForm.jsm
+++ b/intl/locale/PluralForm.jsm
@@ -4,8 +4,6 @@
var EXPORTED_SYMBOLS = ["PluralForm"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
/**
* This module provides the PluralForm object which contains a method to figure
* out which plural form of a word to use for a given number based on the
diff --git a/js/xpconnect/loader/XPCOMUtils.jsm b/js/xpconnect/loader/XPCOMUtils.jsm
index bcde97a9d9c79..1031bf2bc04f2 100644
--- a/js/xpconnect/loader/XPCOMUtils.jsm
+++ b/js/xpconnect/loader/XPCOMUtils.jsm
@@ -6,10 +6,6 @@
var EXPORTED_SYMBOLS = ["XPCOMUtils"];
-const { Services } = ChromeUtils.import(
- "resource://gre/modules/Services.jsm"
-);
-
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/js/xpconnect/tests/unit/environment_loadscript.jsm b/js/xpconnect/tests/unit/environment_loadscript.jsm
index eb8b7070a5f88..0e5a0208ae58b 100644
--- a/js/xpconnect/tests/unit/environment_loadscript.jsm
+++ b/js/xpconnect/tests/unit/environment_loadscript.jsm
@@ -1,5 +1,3 @@
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var EXPORTED_SYMBOLS = ["target", "bound"];
var bound = "";
diff --git a/layout/tools/layout-debug/LayoutDebugChild.jsm b/layout/tools/layout-debug/LayoutDebugChild.jsm
index ba815a8cc75de..c830188ed47cb 100644
--- a/layout/tools/layout-debug/LayoutDebugChild.jsm
+++ b/layout/tools/layout-debug/LayoutDebugChild.jsm
@@ -9,8 +9,6 @@ var EXPORTED_SYMBOLS = ["LayoutDebugChild"];
const NS_LAYOUT_DEBUGGINGTOOLS_CONTRACTID =
"@mozilla.org/layout-debug/layout-debuggingtools;1";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
class LayoutDebugChild extends JSWindowActorChild {
receiveMessage(msg) {
if (!this._debuggingTools) {
diff --git a/layout/tools/reftest/manifest.jsm b/layout/tools/reftest/manifest.jsm
index b60b65f9e8d31..d88aea0a9bd13 100644
--- a/layout/tools/reftest/manifest.jsm
+++ b/layout/tools/reftest/manifest.jsm
@@ -30,7 +30,6 @@ const {
g,
} = ChromeUtils.import("resource://reftest/globals.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
diff --git a/layout/tools/reftest/reftest.jsm b/layout/tools/reftest/reftest.jsm
index 0ee5024bfa090..620074e960e9c 100644
--- a/layout/tools/reftest/reftest.jsm
+++ b/layout/tools/reftest/reftest.jsm
@@ -54,7 +54,6 @@ const { StructuredLogger } = ChromeUtils.import(
const { PerTestCoverageUtils } = ChromeUtils.import(
"resource://reftest/PerTestCoverageUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/mobile/android/actors/ContentDelegateChild.jsm b/mobile/android/actors/ContentDelegateChild.jsm
index 6616efa358586..2ed04e1d7275e 100644
--- a/mobile/android/actors/ContentDelegateChild.jsm
+++ b/mobile/android/actors/ContentDelegateChild.jsm
@@ -10,8 +10,6 @@ var { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
diff --git a/mobile/android/actors/GeckoViewAutoFillChild.jsm b/mobile/android/actors/GeckoViewAutoFillChild.jsm
index 97cf865192fc9..9f338f1f523e8 100644
--- a/mobile/android/actors/GeckoViewAutoFillChild.jsm
+++ b/mobile/android/actors/GeckoViewAutoFillChild.jsm
@@ -11,7 +11,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { GeckoViewUtils } = ChromeUtils.import(
"resource://gre/modules/GeckoViewUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/mobile/android/actors/GeckoViewAutoFillParent.jsm b/mobile/android/actors/GeckoViewAutoFillParent.jsm
index f342cd90d1dad..2fc37381eeae7 100644
--- a/mobile/android/actors/GeckoViewAutoFillParent.jsm
+++ b/mobile/android/actors/GeckoViewAutoFillParent.jsm
@@ -5,7 +5,6 @@
var EXPORTED_SYMBOLS = ["GeckoViewAutoFillParent"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/mobile/android/actors/GeckoViewContentChild.jsm b/mobile/android/actors/GeckoViewContentChild.jsm
index d317b8674627b..09d714d70a01b 100644
--- a/mobile/android/actors/GeckoViewContentChild.jsm
+++ b/mobile/android/actors/GeckoViewContentChild.jsm
@@ -10,8 +10,6 @@ var { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
// This needs to match ScreenLength.java
const SCREEN_LENGTH_TYPE_PIXEL = 0;
const SCREEN_LENGTH_TYPE_VISUAL_VIEWPORT_WIDTH = 1;
diff --git a/mobile/android/actors/GeckoViewPermissionChild.jsm b/mobile/android/actors/GeckoViewPermissionChild.jsm
index 06d9111c102ee..0da76b3f0de65 100644
--- a/mobile/android/actors/GeckoViewPermissionChild.jsm
+++ b/mobile/android/actors/GeckoViewPermissionChild.jsm
@@ -11,7 +11,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { GeckoViewActorChild } = ChromeUtils.import(
"resource://gre/modules/GeckoViewActorChild.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/mobile/android/actors/GeckoViewPermissionParent.jsm b/mobile/android/actors/GeckoViewPermissionParent.jsm
index be5ce6ebd4ef5..1757cf3b64762 100644
--- a/mobile/android/actors/GeckoViewPermissionParent.jsm
+++ b/mobile/android/actors/GeckoViewPermissionParent.jsm
@@ -11,7 +11,6 @@ const { GeckoViewUtils } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { GeckoViewActorParent } = ChromeUtils.import(
"resource://gre/modules/GeckoViewActorParent.jsm"
);
diff --git a/mobile/android/actors/GeckoViewPermissionProcessChild.jsm b/mobile/android/actors/GeckoViewPermissionProcessChild.jsm
index 73f3751b6f583..11f3236b6a1db 100644
--- a/mobile/android/actors/GeckoViewPermissionProcessChild.jsm
+++ b/mobile/android/actors/GeckoViewPermissionProcessChild.jsm
@@ -11,7 +11,6 @@ const { GeckoViewActorChild } = ChromeUtils.import(
const { GeckoViewUtils } = ChromeUtils.import(
"resource://gre/modules/GeckoViewUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/mobile/android/actors/GeckoViewPermissionProcessParent.jsm b/mobile/android/actors/GeckoViewPermissionProcessParent.jsm
index 667213c5158c9..4be3acb555063 100644
--- a/mobile/android/actors/GeckoViewPermissionProcessParent.jsm
+++ b/mobile/android/actors/GeckoViewPermissionProcessParent.jsm
@@ -8,7 +8,6 @@ var EXPORTED_SYMBOLS = ["GeckoViewPermissionProcessParent"];
const { GeckoViewUtils } = ChromeUtils.import(
"resource://gre/modules/GeckoViewUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
// See: http://developer.android.com/reference/android/Manifest.permission.html
const PERM_CAMERA = "android.permission.CAMERA";
diff --git a/mobile/android/actors/GeckoViewPromptChild.jsm b/mobile/android/actors/GeckoViewPromptChild.jsm
index 927b04bf6bbb6..193db209f129a 100644
--- a/mobile/android/actors/GeckoViewPromptChild.jsm
+++ b/mobile/android/actors/GeckoViewPromptChild.jsm
@@ -10,8 +10,6 @@ const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const EXPORTED_SYMBOLS = ["GeckoViewPromptChild"];
class GeckoViewPromptChild extends GeckoViewActorChild {
diff --git a/mobile/android/actors/GeckoViewPrompterParent.jsm b/mobile/android/actors/GeckoViewPrompterParent.jsm
index feb5c44697e9a..2db4129a29114 100644
--- a/mobile/android/actors/GeckoViewPrompterParent.jsm
+++ b/mobile/android/actors/GeckoViewPrompterParent.jsm
@@ -10,8 +10,6 @@ const { GeckoViewActorParent } = ChromeUtils.import(
"resource://gre/modules/GeckoViewActorParent.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const DIALOGS = [
"alert",
"alertCheck",
diff --git a/mobile/android/actors/GeckoViewSettingsChild.jsm b/mobile/android/actors/GeckoViewSettingsChild.jsm
index 9306512e10d5d..28c55bbaa59ae 100644
--- a/mobile/android/actors/GeckoViewSettingsChild.jsm
+++ b/mobile/android/actors/GeckoViewSettingsChild.jsm
@@ -10,8 +10,6 @@ const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const EXPORTED_SYMBOLS = ["GeckoViewSettingsChild"];
// This needs to match GeckoSessionSettings.java
diff --git a/mobile/android/actors/LoadURIDelegateChild.jsm b/mobile/android/actors/LoadURIDelegateChild.jsm
index 59aae38509cf6..9ce0982bb8389 100644
--- a/mobile/android/actors/LoadURIDelegateChild.jsm
+++ b/mobile/android/actors/LoadURIDelegateChild.jsm
@@ -11,7 +11,6 @@ const { LoadURIDelegate } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/mobile/android/actors/ProgressDelegateChild.jsm b/mobile/android/actors/ProgressDelegateChild.jsm
index a3bea1da900fb..6d36964636d5a 100644
--- a/mobile/android/actors/ProgressDelegateChild.jsm
+++ b/mobile/android/actors/ProgressDelegateChild.jsm
@@ -10,8 +10,6 @@ const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const EXPORTED_SYMBOLS = ["ProgressDelegateChild"];
class ProgressDelegateChild extends GeckoViewActorChild {
diff --git a/mobile/android/actors/ScrollDelegateChild.jsm b/mobile/android/actors/ScrollDelegateChild.jsm
index c94eb90ba2e68..c77d36c26c42d 100644
--- a/mobile/android/actors/ScrollDelegateChild.jsm
+++ b/mobile/android/actors/ScrollDelegateChild.jsm
@@ -10,8 +10,6 @@ const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const EXPORTED_SYMBOLS = ["ScrollDelegateChild"];
class ScrollDelegateChild extends GeckoViewActorChild {
diff --git a/mobile/android/actors/SelectionActionDelegateChild.jsm b/mobile/android/actors/SelectionActionDelegateChild.jsm
index 46fd218e8fbe1..c3d197994adc2 100644
--- a/mobile/android/actors/SelectionActionDelegateChild.jsm
+++ b/mobile/android/actors/SelectionActionDelegateChild.jsm
@@ -8,7 +8,6 @@ const { GeckoViewActorChild } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const EXPORTED_SYMBOLS = ["SelectionActionDelegateChild"];
const MAGNIFIER_PREF = "layout.accessiblecaret.magnifier.enabled";
diff --git a/mobile/android/actors/SelectionActionDelegateParent.jsm b/mobile/android/actors/SelectionActionDelegateParent.jsm
index 54fe3dbca9ade..6e5ce7d37eeae 100644
--- a/mobile/android/actors/SelectionActionDelegateParent.jsm
+++ b/mobile/android/actors/SelectionActionDelegateParent.jsm
@@ -8,7 +8,6 @@ var EXPORTED_SYMBOLS = ["SelectionActionDelegateParent"];
const { GeckoViewActorParent } = ChromeUtils.import(
"resource://gre/modules/GeckoViewActorParent.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
class SelectionActionDelegateParent extends GeckoViewActorParent {
respondTo = null;
diff --git a/mobile/android/components/geckoview/FilePickerDelegate.jsm b/mobile/android/components/geckoview/FilePickerDelegate.jsm
index e6a1e23d9368b..f5f9941e538ee 100644
--- a/mobile/android/components/geckoview/FilePickerDelegate.jsm
+++ b/mobile/android/components/geckoview/FilePickerDelegate.jsm
@@ -12,7 +12,6 @@ const { GeckoViewUtils } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/mobile/android/components/geckoview/GeckoViewPermission.jsm b/mobile/android/components/geckoview/GeckoViewPermission.jsm
index 644017cd10a6e..db3da24e86ff2 100644
--- a/mobile/android/components/geckoview/GeckoViewPermission.jsm
+++ b/mobile/android/components/geckoview/GeckoViewPermission.jsm
@@ -8,7 +8,6 @@ var EXPORTED_SYMBOLS = ["GeckoViewPermission"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { GeckoViewUtils } = ChromeUtils.import(
"resource://gre/modules/GeckoViewUtils.jsm"
);
diff --git a/mobile/android/components/geckoview/GeckoViewPrompt.jsm b/mobile/android/components/geckoview/GeckoViewPrompt.jsm
index 9813352b906f5..c58d2d22de5e3 100644
--- a/mobile/android/components/geckoview/GeckoViewPrompt.jsm
+++ b/mobile/android/components/geckoview/GeckoViewPrompt.jsm
@@ -12,7 +12,6 @@ const { GeckoViewUtils } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/mobile/android/components/geckoview/GeckoViewPrompter.jsm b/mobile/android/components/geckoview/GeckoViewPrompter.jsm
index 20f907cdd44d3..cb928d2a22d42 100644
--- a/mobile/android/components/geckoview/GeckoViewPrompter.jsm
+++ b/mobile/android/components/geckoview/GeckoViewPrompter.jsm
@@ -9,7 +9,6 @@ const { GeckoViewUtils } = ChromeUtils.import(
"resource://gre/modules/GeckoViewUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/mobile/android/components/geckoview/GeckoViewStartup.jsm b/mobile/android/components/geckoview/GeckoViewStartup.jsm
index 07384017a72fc..0f9b5c005abaa 100644
--- a/mobile/android/components/geckoview/GeckoViewStartup.jsm
+++ b/mobile/android/components/geckoview/GeckoViewStartup.jsm
@@ -11,7 +11,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { GeckoViewUtils } = ChromeUtils.import(
"resource://gre/modules/GeckoViewUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/mobile/android/components/geckoview/LoginStorageDelegate.jsm b/mobile/android/components/geckoview/LoginStorageDelegate.jsm
index 933f934b0b9ea..6307aca1be5f4 100644
--- a/mobile/android/components/geckoview/LoginStorageDelegate.jsm
+++ b/mobile/android/components/geckoview/LoginStorageDelegate.jsm
@@ -12,7 +12,6 @@ const { GeckoViewUtils } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/mobile/android/components/geckoview/ShareDelegate.jsm b/mobile/android/components/geckoview/ShareDelegate.jsm
index 048e807b12682..06a083430c2aa 100644
--- a/mobile/android/components/geckoview/ShareDelegate.jsm
+++ b/mobile/android/components/geckoview/ShareDelegate.jsm
@@ -12,7 +12,6 @@ const { GeckoViewUtils } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/mobile/android/geckoview/src/androidTest/assets/web_extensions/test-support/TestSupportChild.jsm b/mobile/android/geckoview/src/androidTest/assets/web_extensions/test-support/TestSupportChild.jsm
index 0cb0c01aaea76..f367d50646260 100644
--- a/mobile/android/geckoview/src/androidTest/assets/web_extensions/test-support/TestSupportChild.jsm
+++ b/mobile/android/geckoview/src/androidTest/assets/web_extensions/test-support/TestSupportChild.jsm
@@ -6,8 +6,6 @@ const { GeckoViewActorChild } = ChromeUtils.import(
"resource://gre/modules/GeckoViewActorChild.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const EXPORTED_SYMBOLS = ["TestSupportChild"];
class TestSupportChild extends GeckoViewActorChild {
diff --git a/mobile/android/geckoview/src/androidTest/assets/web_extensions/test-support/TestSupportProcessChild.jsm b/mobile/android/geckoview/src/androidTest/assets/web_extensions/test-support/TestSupportProcessChild.jsm
index f044a4607f121..e81150a53c17b 100644
--- a/mobile/android/geckoview/src/androidTest/assets/web_extensions/test-support/TestSupportProcessChild.jsm
+++ b/mobile/android/geckoview/src/androidTest/assets/web_extensions/test-support/TestSupportProcessChild.jsm
@@ -8,8 +8,6 @@ const { GeckoViewUtils } = ChromeUtils.import(
"resource://gre/modules/GeckoViewUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const ProcessTools = Cc["@mozilla.org/processtools-service;1"].getService(
Ci.nsIProcessToolsService
);
diff --git a/mobile/android/modules/geckoview/ChildCrashHandler.jsm b/mobile/android/modules/geckoview/ChildCrashHandler.jsm
index 10358c43d7736..7e956ea602ab7 100644
--- a/mobile/android/modules/geckoview/ChildCrashHandler.jsm
+++ b/mobile/android/modules/geckoview/ChildCrashHandler.jsm
@@ -12,7 +12,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { GeckoViewUtils } = ChromeUtils.import(
"resource://gre/modules/GeckoViewUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/mobile/android/modules/geckoview/GeckoViewConsole.jsm b/mobile/android/modules/geckoview/GeckoViewConsole.jsm
index a660b58f4da6f..f80bfe8d337a5 100644
--- a/mobile/android/modules/geckoview/GeckoViewConsole.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewConsole.jsm
@@ -11,7 +11,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { GeckoViewUtils } = ChromeUtils.import(
"resource://gre/modules/GeckoViewUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { debug, warn } = GeckoViewUtils.initLogging("Console");
diff --git a/mobile/android/modules/geckoview/GeckoViewContent.jsm b/mobile/android/modules/geckoview/GeckoViewContent.jsm
index 26b4ba2d81ba6..bff2b15cdd12b 100644
--- a/mobile/android/modules/geckoview/GeckoViewContent.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewContent.jsm
@@ -12,7 +12,6 @@ const { GeckoViewModule } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
class GeckoViewContent extends GeckoViewModule {
onInit() {
diff --git a/mobile/android/modules/geckoview/GeckoViewNavigation.jsm b/mobile/android/modules/geckoview/GeckoViewNavigation.jsm
index 4dfc10181d400..ec1d1642a890c 100644
--- a/mobile/android/modules/geckoview/GeckoViewNavigation.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewNavigation.jsm
@@ -12,7 +12,6 @@ const { GeckoViewModule } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/mobile/android/modules/geckoview/GeckoViewProcessHangMonitor.jsm b/mobile/android/modules/geckoview/GeckoViewProcessHangMonitor.jsm
index 29a9217263511..e020a2e96e0c1 100644
--- a/mobile/android/modules/geckoview/GeckoViewProcessHangMonitor.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewProcessHangMonitor.jsm
@@ -10,8 +10,6 @@ const { GeckoViewModule } = ChromeUtils.import(
"resource://gre/modules/GeckoViewModule.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
class GeckoViewProcessHangMonitor extends GeckoViewModule {
constructor(aModuleInfo) {
super(aModuleInfo);
diff --git a/mobile/android/modules/geckoview/GeckoViewProgress.jsm b/mobile/android/modules/geckoview/GeckoViewProgress.jsm
index 404284ec81e04..26e3eae766ba4 100644
--- a/mobile/android/modules/geckoview/GeckoViewProgress.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewProgress.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["GeckoViewProgress"];
const { GeckoViewModule } = ChromeUtils.import(
"resource://gre/modules/GeckoViewModule.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/mobile/android/modules/geckoview/GeckoViewPushController.jsm b/mobile/android/modules/geckoview/GeckoViewPushController.jsm
index 51897cb9806fd..99ce3b14a2bf1 100644
--- a/mobile/android/modules/geckoview/GeckoViewPushController.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewPushController.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["GeckoViewPushController"];
const { GeckoViewUtils } = ChromeUtils.import(
"resource://gre/modules/GeckoViewUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/mobile/android/modules/geckoview/GeckoViewRemoteDebugger.jsm b/mobile/android/modules/geckoview/GeckoViewRemoteDebugger.jsm
index 8369e2ef58235..f9a2ca5806e63 100644
--- a/mobile/android/modules/geckoview/GeckoViewRemoteDebugger.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewRemoteDebugger.jsm
@@ -12,7 +12,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { GeckoViewUtils } = ChromeUtils.import(
"resource://gre/modules/GeckoViewUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/mobile/android/modules/geckoview/GeckoViewSelectionAction.jsm b/mobile/android/modules/geckoview/GeckoViewSelectionAction.jsm
index a5cf5caad3ad3..29abfea90e897 100644
--- a/mobile/android/modules/geckoview/GeckoViewSelectionAction.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewSelectionAction.jsm
@@ -13,7 +13,6 @@ const { GeckoViewModule } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
class GeckoViewSelectionAction extends GeckoViewModule {
onEnable() {
diff --git a/mobile/android/modules/geckoview/GeckoViewSettings.jsm b/mobile/android/modules/geckoview/GeckoViewSettings.jsm
index c117ce7e79b5a..e8a9061952232 100644
--- a/mobile/android/modules/geckoview/GeckoViewSettings.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewSettings.jsm
@@ -13,7 +13,6 @@ const { GeckoViewModule } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/mobile/android/modules/geckoview/GeckoViewStorageController.jsm b/mobile/android/modules/geckoview/GeckoViewStorageController.jsm
index 856667f879a42..1abaea06c4659 100644
--- a/mobile/android/modules/geckoview/GeckoViewStorageController.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewStorageController.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["GeckoViewStorageController"];
const { GeckoViewUtils } = ChromeUtils.import(
"resource://gre/modules/GeckoViewUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { PrincipalsCollector } = ChromeUtils.import(
"resource://gre/modules/PrincipalsCollector.jsm"
);
diff --git a/mobile/android/modules/geckoview/GeckoViewTab.jsm b/mobile/android/modules/geckoview/GeckoViewTab.jsm
index 262cc3460622a..7f8feb30fe386 100644
--- a/mobile/android/modules/geckoview/GeckoViewTab.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewTab.jsm
@@ -12,7 +12,6 @@ const { GeckoViewModule } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { ExtensionUtils } = ChromeUtils.import(
"resource://gre/modules/ExtensionUtils.jsm"
);
diff --git a/mobile/android/modules/geckoview/GeckoViewUtils.jsm b/mobile/android/modules/geckoview/GeckoViewUtils.jsm
index 1ac64cfee0b5c..6a5d1cedf1dcf 100644
--- a/mobile/android/modules/geckoview/GeckoViewUtils.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewUtils.jsm
@@ -6,7 +6,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
const lazy = {};
diff --git a/mobile/android/modules/geckoview/GeckoViewWebExtension.jsm b/mobile/android/modules/geckoview/GeckoViewWebExtension.jsm
index 2a32effe4fe55..3c18fcb06b933 100644
--- a/mobile/android/modules/geckoview/GeckoViewWebExtension.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewWebExtension.jsm
@@ -21,7 +21,6 @@ const { GeckoViewUtils } = ChromeUtils.import(
const { EventEmitter } = ChromeUtils.import(
"resource://gre/modules/EventEmitter.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const PRIVATE_BROWSING_PERMISSION = {
permissions: ["internal:privateBrowsingAllowed"],
diff --git a/mobile/android/modules/geckoview/LoadURIDelegate.jsm b/mobile/android/modules/geckoview/LoadURIDelegate.jsm
index 17b4eeae123aa..aecce7ab6a321 100644
--- a/mobile/android/modules/geckoview/LoadURIDelegate.jsm
+++ b/mobile/android/modules/geckoview/LoadURIDelegate.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["LoadURIDelegate"];
const { GeckoViewUtils } = ChromeUtils.import(
"resource://gre/modules/GeckoViewUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { debug, warn } = GeckoViewUtils.initLogging("LoadURIDelegate");
diff --git a/mobile/android/modules/geckoview/Messaging.jsm b/mobile/android/modules/geckoview/Messaging.jsm
index 8f985ba567865..d6b99b6510de7 100644
--- a/mobile/android/modules/geckoview/Messaging.jsm
+++ b/mobile/android/modules/geckoview/Messaging.jsm
@@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/mobile/android/modules/test/AppUiTestDelegate.jsm b/mobile/android/modules/test/AppUiTestDelegate.jsm
index dd7c4bd0a29a9..2ca46e969b0e0 100644
--- a/mobile/android/modules/test/AppUiTestDelegate.jsm
+++ b/mobile/android/modules/test/AppUiTestDelegate.jsm
@@ -6,7 +6,6 @@
const EXPORTED_SYMBOLS = ["AppUiTestDelegate"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/netwerk/base/NetUtil.jsm b/netwerk/base/NetUtil.jsm
index f901b9805b9dc..ff1b090882174 100644
--- a/netwerk/base/NetUtil.jsm
+++ b/netwerk/base/NetUtil.jsm
@@ -15,8 +15,6 @@ var EXPORTED_SYMBOLS = ["NetUtil"];
const PR_UINT32_MAX = 0xffffffff;
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const BinaryInputStream = Components.Constructor(
"@mozilla.org/binaryinputstream;1",
"nsIBinaryInputStream",
diff --git a/netwerk/dns/PublicSuffixList.jsm b/netwerk/dns/PublicSuffixList.jsm
index de7fc7302b136..db4eddf8ae9e5 100644
--- a/netwerk/dns/PublicSuffixList.jsm
+++ b/netwerk/dns/PublicSuffixList.jsm
@@ -6,7 +6,6 @@
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const FileUtils = ChromeUtils.import("resource://gre/modules/FileUtils.jsm")
.FileUtils;
diff --git a/netwerk/test/browser/early_hint_preload_test_helper.jsm b/netwerk/test/browser/early_hint_preload_test_helper.jsm
index 8cd2924351b2f..10a7fa58b2912 100644
--- a/netwerk/test/browser/early_hint_preload_test_helper.jsm
+++ b/netwerk/test/browser/early_hint_preload_test_helper.jsm
@@ -14,7 +14,6 @@ const { Assert } = ChromeUtils.import("resource://testing-common/Assert.jsm");
const { BrowserTestUtils } = ChromeUtils.import(
"resource://testing-common/BrowserTestUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { gBrowser } = Services.wm.getMostRecentWindow("navigator:browser");
// TODO: remove this and do strict request count
diff --git a/netwerk/url-classifier/UrlClassifierExceptionListService.jsm b/netwerk/url-classifier/UrlClassifierExceptionListService.jsm
index e6f47e5fdfb09..0eded8070b2ca 100644
--- a/netwerk/url-classifier/UrlClassifierExceptionListService.jsm
+++ b/netwerk/url-classifier/UrlClassifierExceptionListService.jsm
@@ -4,8 +4,6 @@
function UrlClassifierExceptionListService() {}
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/remote/cdp/CDPConnection.jsm b/remote/cdp/CDPConnection.jsm
index c8b0a183b6e49..198410b7151c5 100644
--- a/remote/cdp/CDPConnection.jsm
+++ b/remote/cdp/CDPConnection.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["CDPConnection", "splitMethod"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/cdp/Error.jsm b/remote/cdp/Error.jsm
index e6975615897d8..f501146faab9c 100644
--- a/remote/cdp/Error.jsm
+++ b/remote/cdp/Error.jsm
@@ -11,7 +11,6 @@ var EXPORTED_SYMBOLS = [
"UnsupportedError",
];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/cdp/JSONHandler.jsm b/remote/cdp/JSONHandler.jsm
index b66e7cffc8b45..b6d4fc0cbd319 100644
--- a/remote/cdp/JSONHandler.jsm
+++ b/remote/cdp/JSONHandler.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["JSONHandler"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/cdp/StreamRegistry.jsm b/remote/cdp/StreamRegistry.jsm
index a63a1ed16b269..22627f47c42f9 100644
--- a/remote/cdp/StreamRegistry.jsm
+++ b/remote/cdp/StreamRegistry.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["StreamRegistry"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/cdp/domains/content/Log.jsm b/remote/cdp/domains/content/Log.jsm
index 9a700cd8f8430..aeb69697faab3 100644
--- a/remote/cdp/domains/content/Log.jsm
+++ b/remote/cdp/domains/content/Log.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["Log"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { ContentProcessDomain } = ChromeUtils.import(
"chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
);
diff --git a/remote/cdp/domains/content/Page.jsm b/remote/cdp/domains/content/Page.jsm
index 46ec58ab4fcd0..a651d7396a47f 100644
--- a/remote/cdp/domains/content/Page.jsm
+++ b/remote/cdp/domains/content/Page.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["Page"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { ContentProcessDomain } = ChromeUtils.import(
"chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
);
diff --git a/remote/cdp/domains/content/Runtime.jsm b/remote/cdp/domains/content/Runtime.jsm
index fe1725938dd81..77ad2ed1a5e85 100644
--- a/remote/cdp/domains/content/Runtime.jsm
+++ b/remote/cdp/domains/content/Runtime.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["Runtime"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/cdp/domains/content/runtime/ExecutionContext.jsm b/remote/cdp/domains/content/runtime/ExecutionContext.jsm
index 8d4e927447ffa..0e3bdbd75777d 100644
--- a/remote/cdp/domains/content/runtime/ExecutionContext.jsm
+++ b/remote/cdp/domains/content/runtime/ExecutionContext.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["ExecutionContext"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const TYPED_ARRAY_CLASSES = [
"Uint8Array",
"Uint8ClampedArray",
diff --git a/remote/cdp/domains/parent/Browser.jsm b/remote/cdp/domains/parent/Browser.jsm
index 7f00dbef33b45..63635498f65da 100644
--- a/remote/cdp/domains/parent/Browser.jsm
+++ b/remote/cdp/domains/parent/Browser.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["Browser"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { Domain } = ChromeUtils.import(
"chrome://remote/content/cdp/domains/Domain.jsm"
);
diff --git a/remote/cdp/domains/parent/Input.jsm b/remote/cdp/domains/parent/Input.jsm
index ddbdfa2c92809..1bd89bd2f3d39 100644
--- a/remote/cdp/domains/parent/Input.jsm
+++ b/remote/cdp/domains/parent/Input.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["Input"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { Domain } = ChromeUtils.import(
"chrome://remote/content/cdp/domains/Domain.jsm"
);
diff --git a/remote/cdp/domains/parent/Network.jsm b/remote/cdp/domains/parent/Network.jsm
index bf8724f5ac026..feff34d9e5dc5 100644
--- a/remote/cdp/domains/parent/Network.jsm
+++ b/remote/cdp/domains/parent/Network.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["Network"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { Domain } = ChromeUtils.import(
"chrome://remote/content/cdp/domains/Domain.jsm"
);
diff --git a/remote/cdp/domains/parent/Page.jsm b/remote/cdp/domains/parent/Page.jsm
index f54afbea99841..34f9b25c1374a 100644
--- a/remote/cdp/domains/parent/Page.jsm
+++ b/remote/cdp/domains/parent/Page.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["Page"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/cdp/domains/parent/Target.jsm b/remote/cdp/domains/parent/Target.jsm
index 2c2162d0cde78..07561958ac83d 100644
--- a/remote/cdp/domains/parent/Target.jsm
+++ b/remote/cdp/domains/parent/Target.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["Target"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/cdp/domains/parent/page/DialogHandler.jsm b/remote/cdp/domains/parent/page/DialogHandler.jsm
index 4aa4504cc9513..884fc50754df2 100644
--- a/remote/cdp/domains/parent/page/DialogHandler.jsm
+++ b/remote/cdp/domains/parent/page/DialogHandler.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["DialogHandler"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/cdp/observers/ChannelEventSink.jsm b/remote/cdp/observers/ChannelEventSink.jsm
index 6206aac129384..8874672faabdd 100644
--- a/remote/cdp/observers/ChannelEventSink.jsm
+++ b/remote/cdp/observers/ChannelEventSink.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["ChannelEventSinkFactory"];
const { ComponentUtils } = ChromeUtils.import(
"resource://gre/modules/ComponentUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const Cm = Components.manager;
diff --git a/remote/cdp/observers/ContextObserver.jsm b/remote/cdp/observers/ContextObserver.jsm
index c2030a936a71e..65db1178a089d 100644
--- a/remote/cdp/observers/ContextObserver.jsm
+++ b/remote/cdp/observers/ContextObserver.jsm
@@ -25,7 +25,6 @@
var EXPORTED_SYMBOLS = ["ContextObserver"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/cdp/observers/NetworkObserver.jsm b/remote/cdp/observers/NetworkObserver.jsm
index 0e8799984b7e3..acc2ee433fab7 100644
--- a/remote/cdp/observers/NetworkObserver.jsm
+++ b/remote/cdp/observers/NetworkObserver.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/cdp/observers/TargetObserver.jsm b/remote/cdp/observers/TargetObserver.jsm
index fb6f19fe338d8..60a79688d01f6 100644
--- a/remote/cdp/observers/TargetObserver.jsm
+++ b/remote/cdp/observers/TargetObserver.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["TabObserver"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/cdp/targets/TabTarget.jsm b/remote/cdp/targets/TabTarget.jsm
index 414819d006ebc..69029d1aa9c67 100644
--- a/remote/cdp/targets/TabTarget.jsm
+++ b/remote/cdp/targets/TabTarget.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["TabTarget"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/cdp/targets/Target.jsm b/remote/cdp/targets/Target.jsm
index 6b191a646aa74..510108d5bc543 100644
--- a/remote/cdp/targets/Target.jsm
+++ b/remote/cdp/targets/Target.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["Target"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/components/Marionette.jsm b/remote/components/Marionette.jsm
index e49262ed47401..d2952ff44b8ea 100644
--- a/remote/components/Marionette.jsm
+++ b/remote/components/Marionette.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["Marionette", "MarionetteFactory"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/components/RemoteAgent.jsm b/remote/components/RemoteAgent.jsm
index e7ae5f9390b34..12c21c6162c4f 100644
--- a/remote/components/RemoteAgent.jsm
+++ b/remote/components/RemoteAgent.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["RemoteAgent", "RemoteAgentFactory"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/marionette/actors/MarionetteCommandsChild.jsm b/remote/marionette/actors/MarionetteCommandsChild.jsm
index 133664cf0abc7..2f95be61fdab0 100644
--- a/remote/marionette/actors/MarionetteCommandsChild.jsm
+++ b/remote/marionette/actors/MarionetteCommandsChild.jsm
@@ -8,7 +8,6 @@
const EXPORTED_SYMBOLS = ["MarionetteCommandsChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/marionette/actors/MarionetteEventsChild.jsm b/remote/marionette/actors/MarionetteEventsChild.jsm
index 74eeabecbf026..376b78b6016e1 100644
--- a/remote/marionette/actors/MarionetteEventsChild.jsm
+++ b/remote/marionette/actors/MarionetteEventsChild.jsm
@@ -8,7 +8,6 @@
const EXPORTED_SYMBOLS = ["MarionetteEventsChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/marionette/actors/MarionetteEventsParent.jsm b/remote/marionette/actors/MarionetteEventsParent.jsm
index f25481249b908..fcefdc1e4ed70 100644
--- a/remote/marionette/actors/MarionetteEventsParent.jsm
+++ b/remote/marionette/actors/MarionetteEventsParent.jsm
@@ -11,7 +11,6 @@ const EXPORTED_SYMBOLS = [
"MarionetteEventsParent",
];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/server/WebSocketHandshake.jsm b/remote/server/WebSocketHandshake.jsm
index f09dc68bd38e7..acfb46cfa4568 100644
--- a/remote/server/WebSocketHandshake.jsm
+++ b/remote/server/WebSocketHandshake.jsm
@@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = ["WebSocketHandshake"];
const CC = Components.Constructor;
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/shared/Format.jsm b/remote/shared/Format.jsm
index b93dde7d23d01..027191f712133 100644
--- a/remote/shared/Format.jsm
+++ b/remote/shared/Format.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["pprint", "truncate"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/shared/Log.jsm b/remote/shared/Log.jsm
index 488c59274469e..c3cb9e12ede79 100644
--- a/remote/shared/Log.jsm
+++ b/remote/shared/Log.jsm
@@ -10,7 +10,6 @@ const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
const { Log: StdLog } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const PREF_REMOTE_LOG_LEVEL = "remote.log.level";
diff --git a/remote/shared/RecommendedPreferences.jsm b/remote/shared/RecommendedPreferences.jsm
index 0169c6bbfd9e6..4894cc1643cc9 100644
--- a/remote/shared/RecommendedPreferences.jsm
+++ b/remote/shared/RecommendedPreferences.jsm
@@ -6,7 +6,6 @@
const EXPORTED_SYMBOLS = ["RecommendedPreferences"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/shared/Sync.jsm b/remote/shared/Sync.jsm
index b2be7c8b70131..6f6a314a74500 100644
--- a/remote/shared/Sync.jsm
+++ b/remote/shared/Sync.jsm
@@ -12,7 +12,6 @@ var EXPORTED_SYMBOLS = [
"PollPromise",
];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/shared/TabManager.jsm b/remote/shared/TabManager.jsm
index 19a11cf594e8c..b8cf1732478a4 100644
--- a/remote/shared/TabManager.jsm
+++ b/remote/shared/TabManager.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["TabManager"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/shared/WebSocketConnection.jsm b/remote/shared/WebSocketConnection.jsm
index 4a961c37528b9..7b70c9775365c 100644
--- a/remote/shared/WebSocketConnection.jsm
+++ b/remote/shared/WebSocketConnection.jsm
@@ -7,7 +7,6 @@
var EXPORTED_SYMBOLS = ["WebSocketConnection"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/shared/WindowManager.jsm b/remote/shared/WindowManager.jsm
index 79d363fbfc064..5cfda48ccd6fe 100644
--- a/remote/shared/WindowManager.jsm
+++ b/remote/shared/WindowManager.jsm
@@ -6,7 +6,6 @@
const EXPORTED_SYMBOLS = ["windowManager"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/shared/listeners/BrowsingContextListener.jsm b/remote/shared/listeners/BrowsingContextListener.jsm
index 86ee37974e788..6ac2dbf7ccf44 100644
--- a/remote/shared/listeners/BrowsingContextListener.jsm
+++ b/remote/shared/listeners/BrowsingContextListener.jsm
@@ -6,7 +6,6 @@
const EXPORTED_SYMBOLS = ["BrowsingContextListener"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/shared/listeners/ConsoleListener.jsm b/remote/shared/listeners/ConsoleListener.jsm
index 2dcaaef2fb8ba..afd9f5b79218b 100644
--- a/remote/shared/listeners/ConsoleListener.jsm
+++ b/remote/shared/listeners/ConsoleListener.jsm
@@ -6,7 +6,6 @@
const EXPORTED_SYMBOLS = ["ConsoleListener"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/shared/messagehandler/ModuleCache.jsm b/remote/shared/messagehandler/ModuleCache.jsm
index a137f2311d945..1a9b7709dabe8 100644
--- a/remote/shared/messagehandler/ModuleCache.jsm
+++ b/remote/shared/messagehandler/ModuleCache.jsm
@@ -6,7 +6,6 @@
const EXPORTED_SYMBOLS = ["ModuleCache"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/shared/messagehandler/sessiondata/SessionData.jsm b/remote/shared/messagehandler/sessiondata/SessionData.jsm
index a95d77fc95f41..4cddddc7889e9 100644
--- a/remote/shared/messagehandler/sessiondata/SessionData.jsm
+++ b/remote/shared/messagehandler/sessiondata/SessionData.jsm
@@ -6,7 +6,6 @@
const EXPORTED_SYMBOLS = ["SESSION_DATA_SHARED_DATA_KEY", "SessionData"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/shared/messagehandler/sessiondata/SessionDataReader.jsm b/remote/shared/messagehandler/sessiondata/SessionDataReader.jsm
index 94a03cce51260..db872f267a9f9 100644
--- a/remote/shared/messagehandler/sessiondata/SessionDataReader.jsm
+++ b/remote/shared/messagehandler/sessiondata/SessionDataReader.jsm
@@ -6,7 +6,6 @@
const EXPORTED_SYMBOLS = ["readSessionData"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/shared/messagehandler/transports/FrameTransport.jsm b/remote/shared/messagehandler/transports/FrameTransport.jsm
index acb00c3027f1a..5fd0195dbcc76 100644
--- a/remote/shared/messagehandler/transports/FrameTransport.jsm
+++ b/remote/shared/messagehandler/transports/FrameTransport.jsm
@@ -6,7 +6,6 @@
const EXPORTED_SYMBOLS = ["FrameTransport"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/shared/webdriver/Capabilities.jsm b/remote/shared/webdriver/Capabilities.jsm
index 012127b734f43..dca455263c4c3 100644
--- a/remote/shared/webdriver/Capabilities.jsm
+++ b/remote/shared/webdriver/Capabilities.jsm
@@ -12,7 +12,6 @@ const EXPORTED_SYMBOLS = [
"UnhandledPromptBehavior",
];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/shared/webdriver/Session.jsm b/remote/shared/webdriver/Session.jsm
index 3d80d05419589..2a26f0f72fd25 100644
--- a/remote/shared/webdriver/Session.jsm
+++ b/remote/shared/webdriver/Session.jsm
@@ -6,7 +6,6 @@
const EXPORTED_SYMBOLS = ["WebDriverSession"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/remote/webdriver-bidi/modules/root/browsingContext.jsm b/remote/webdriver-bidi/modules/root/browsingContext.jsm
index c07237e898108..6b6c368426287 100644
--- a/remote/webdriver-bidi/modules/root/browsingContext.jsm
+++ b/remote/webdriver-bidi/modules/root/browsingContext.jsm
@@ -6,7 +6,6 @@
const EXPORTED_SYMBOLS = ["browsingContext"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/security/manager/ssl/RemoteSecuritySettings.jsm b/security/manager/ssl/RemoteSecuritySettings.jsm
index aaea7178bdad9..329b4aa69db1d 100644
--- a/security/manager/ssl/RemoteSecuritySettings.jsm
+++ b/security/manager/ssl/RemoteSecuritySettings.jsm
@@ -9,7 +9,6 @@ const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/services/automation/ServicesAutomation.jsm b/services/automation/ServicesAutomation.jsm
index 0163e8919dc14..9cb76df9a0c92 100644
--- a/services/automation/ServicesAutomation.jsm
+++ b/services/automation/ServicesAutomation.jsm
@@ -28,7 +28,6 @@ var EXPORTED_SYMBOLS = ["Sync", "Authentication", "initConfig", "triggerSync"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/services/fxaccounts/Credentials.jsm b/services/fxaccounts/Credentials.jsm
index 431bf2ba20f85..582ab6946eaa4 100644
--- a/services/fxaccounts/Credentials.jsm
+++ b/services/fxaccounts/Credentials.jsm
@@ -14,7 +14,6 @@
var EXPORTED_SYMBOLS = ["Credentials"];
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { CryptoUtils } = ChromeUtils.import(
"resource://services-crypto/utils.js"
);
diff --git a/services/fxaccounts/FxAccounts.jsm b/services/fxaccounts/FxAccounts.jsm
index bb71606d51497..541801e04aafa 100644
--- a/services/fxaccounts/FxAccounts.jsm
+++ b/services/fxaccounts/FxAccounts.jsm
@@ -9,7 +9,6 @@ const { PromiseUtils } = ChromeUtils.import(
const { CryptoUtils } = ChromeUtils.import(
"resource://services-crypto/utils.js"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/services/fxaccounts/FxAccountsClient.jsm b/services/fxaccounts/FxAccountsClient.jsm
index 0be73d8fbd21f..c5d9a599062a6 100644
--- a/services/fxaccounts/FxAccountsClient.jsm
+++ b/services/fxaccounts/FxAccountsClient.jsm
@@ -4,7 +4,6 @@
var EXPORTED_SYMBOLS = ["FxAccountsClient"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
diff --git a/services/fxaccounts/FxAccountsConfig.jsm b/services/fxaccounts/FxAccountsConfig.jsm
index 20bb2df8965da..ced2c3c355a45 100644
--- a/services/fxaccounts/FxAccountsConfig.jsm
+++ b/services/fxaccounts/FxAccountsConfig.jsm
@@ -10,7 +10,6 @@ const { RESTRequest } = ChromeUtils.import(
const { log } = ChromeUtils.import(
"resource://gre/modules/FxAccountsCommon.js"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/services/fxaccounts/FxAccountsDevice.jsm b/services/fxaccounts/FxAccountsDevice.jsm
index 3e62ea4d602e7..a7497be4e0ab1 100644
--- a/services/fxaccounts/FxAccountsDevice.jsm
+++ b/services/fxaccounts/FxAccountsDevice.jsm
@@ -3,8 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/services/fxaccounts/FxAccountsPairing.jsm b/services/fxaccounts/FxAccountsPairing.jsm
index 264a2dfa6cec9..d60070f36601e 100644
--- a/services/fxaccounts/FxAccountsPairing.jsm
+++ b/services/fxaccounts/FxAccountsPairing.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const {
log,
PREF_REMOTE_PAIRING_URI,
diff --git a/services/fxaccounts/FxAccountsProfile.jsm b/services/fxaccounts/FxAccountsProfile.jsm
index fcb5633b630b6..49594d992c6ed 100644
--- a/services/fxaccounts/FxAccountsProfile.jsm
+++ b/services/fxaccounts/FxAccountsProfile.jsm
@@ -14,7 +14,6 @@
var EXPORTED_SYMBOLS = ["FxAccountsProfile"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { ON_PROFILE_CHANGE_NOTIFICATION, log } = ChromeUtils.import(
"resource://gre/modules/FxAccountsCommon.js"
);
diff --git a/services/fxaccounts/FxAccountsPush.jsm b/services/fxaccounts/FxAccountsPush.jsm
index 9448710f823af..f7ca815b92359 100644
--- a/services/fxaccounts/FxAccountsPush.jsm
+++ b/services/fxaccounts/FxAccountsPush.jsm
@@ -2,7 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const {
FXA_PUSH_SCOPE_ACCOUNT_UPDATE,
diff --git a/services/fxaccounts/FxAccountsStorage.jsm b/services/fxaccounts/FxAccountsStorage.jsm
index 17af8ac140335..02eda9713a579 100644
--- a/services/fxaccounts/FxAccountsStorage.jsm
+++ b/services/fxaccounts/FxAccountsStorage.jsm
@@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = [
"LoginManagerStorage",
];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const {
DATA_FORMAT_VERSION,
DEFAULT_STORAGE_FILENAME,
diff --git a/services/fxaccounts/FxAccountsTelemetry.jsm b/services/fxaccounts/FxAccountsTelemetry.jsm
index 8da5751b72d2e..f46c1dd64ae0d 100644
--- a/services/fxaccounts/FxAccountsTelemetry.jsm
+++ b/services/fxaccounts/FxAccountsTelemetry.jsm
@@ -12,7 +12,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/services/fxaccounts/FxAccountsWebChannel.jsm b/services/fxaccounts/FxAccountsWebChannel.jsm
index c27f24279adfc..2ec2969a3006e 100644
--- a/services/fxaccounts/FxAccountsWebChannel.jsm
+++ b/services/fxaccounts/FxAccountsWebChannel.jsm
@@ -46,7 +46,6 @@ const {
const lazy = {};
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(
lazy,
"WebChannel",
diff --git a/services/settings/Database.jsm b/services/settings/Database.jsm
index 11dba978544fb..50add8ea216ba 100644
--- a/services/settings/Database.jsm
+++ b/services/settings/Database.jsm
@@ -5,7 +5,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
index d9f338cfe3ecd..da0203cda1082 100644
--- a/services/settings/RemoteSettingsClient.jsm
+++ b/services/settings/RemoteSettingsClient.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["RemoteSettingsClient"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
index 23d6bf1a20bea..f579041311403 100644
--- a/services/settings/Utils.jsm
+++ b/services/settings/Utils.jsm
@@ -4,7 +4,6 @@
var EXPORTED_SYMBOLS = ["Utils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/services/sync/Weave.jsm b/services/sync/Weave.jsm
index ef28bd4ee8181..4c9ffef974ab8 100644
--- a/services/sync/Weave.jsm
+++ b/services/sync/Weave.jsm
@@ -5,7 +5,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/services/sync/modules/SyncDisconnect.jsm b/services/sync/modules/SyncDisconnect.jsm
index c2474479b6faf..af608afa86315 100644
--- a/services/sync/modules/SyncDisconnect.jsm
+++ b/services/sync/modules/SyncDisconnect.jsm
@@ -8,7 +8,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/services/sync/modules/SyncedTabs.jsm b/services/sync/modules/SyncedTabs.jsm
index 20737505852ec..0d3ef13ebd610 100644
--- a/services/sync/modules/SyncedTabs.jsm
+++ b/services/sync/modules/SyncedTabs.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["SyncedTabs"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/services/sync/modules/UIState.jsm b/services/sync/modules/UIState.jsm
index 458c85961c29d..b93d5674acbbc 100644
--- a/services/sync/modules/UIState.jsm
+++ b/services/sync/modules/UIState.jsm
@@ -16,7 +16,6 @@
var EXPORTED_SYMBOLS = ["UIState"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/services/sync/tps/extensions/tps/resource/auth/fxaccounts.jsm b/services/sync/tps/extensions/tps/resource/auth/fxaccounts.jsm
index 6c761bcc10ec6..455a62cc31aca 100644
--- a/services/sync/tps/extensions/tps/resource/auth/fxaccounts.jsm
+++ b/services/sync/tps/extensions/tps/resource/auth/fxaccounts.jsm
@@ -21,7 +21,6 @@ const { FxAccountsConfig } = ChromeUtils.import(
"resource://gre/modules/FxAccountsConfig.jsm"
);
const { Logger } = ChromeUtils.import("resource://tps/logger.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
/**
* Helper object for Firefox Accounts authentication
diff --git a/services/sync/tps/extensions/tps/resource/logger.jsm b/services/sync/tps/extensions/tps/resource/logger.jsm
index 07579283c0c62..4eab27c4ff167 100644
--- a/services/sync/tps/extensions/tps/resource/logger.jsm
+++ b/services/sync/tps/extensions/tps/resource/logger.jsm
@@ -12,7 +12,6 @@ var EXPORTED_SYMBOLS = ["Logger"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/services/sync/tps/extensions/tps/resource/modules/bookmarks.jsm b/services/sync/tps/extensions/tps/resource/modules/bookmarks.jsm
index c0b0a4e95260f..b8119ad5d2975 100644
--- a/services/sync/tps/extensions/tps/resource/modules/bookmarks.jsm
+++ b/services/sync/tps/extensions/tps/resource/modules/bookmarks.jsm
@@ -24,7 +24,6 @@ const { PlacesSyncUtils } = ChromeUtils.import(
const { PlacesUtils } = ChromeUtils.import(
"resource://gre/modules/PlacesUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { Logger } = ChromeUtils.import("resource://tps/logger.jsm");
async function DumpBookmarks() {
diff --git a/services/sync/tps/extensions/tps/resource/modules/passwords.jsm b/services/sync/tps/extensions/tps/resource/modules/passwords.jsm
index 3f856d076327b..a269cf9debf76 100644
--- a/services/sync/tps/extensions/tps/resource/modules/passwords.jsm
+++ b/services/sync/tps/extensions/tps/resource/modules/passwords.jsm
@@ -9,7 +9,6 @@
var EXPORTED_SYMBOLS = ["Password", "DumpPasswords"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { Logger } = ChromeUtils.import("resource://tps/logger.jsm");
var nsLoginInfo = new Components.Constructor(
diff --git a/services/sync/tps/extensions/tps/resource/modules/prefs.jsm b/services/sync/tps/extensions/tps/resource/modules/prefs.jsm
index 7463caed7c1f5..ddce48c950a2f 100644
--- a/services/sync/tps/extensions/tps/resource/modules/prefs.jsm
+++ b/services/sync/tps/extensions/tps/resource/modules/prefs.jsm
@@ -11,7 +11,6 @@ var EXPORTED_SYMBOLS = ["Preference"];
const WEAVE_PREF_PREFIX = "services.sync.prefs.sync.";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { Logger } = ChromeUtils.import("resource://tps/logger.jsm");
/**
diff --git a/services/sync/tps/extensions/tps/resource/modules/tabs.jsm b/services/sync/tps/extensions/tps/resource/modules/tabs.jsm
index ee81e0519f30c..a8caacd158343 100644
--- a/services/sync/tps/extensions/tps/resource/modules/tabs.jsm
+++ b/services/sync/tps/extensions/tps/resource/modules/tabs.jsm
@@ -9,7 +9,6 @@
const EXPORTED_SYMBOLS = ["BrowserTabs"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { Weave } = ChromeUtils.import("resource://services-sync/main.js");
const { Logger } = ChromeUtils.import("resource://tps/logger.jsm");
diff --git a/services/sync/tps/extensions/tps/resource/modules/windows.jsm b/services/sync/tps/extensions/tps/resource/modules/windows.jsm
index 8aa3af68a0483..b5c62c1f3564f 100644
--- a/services/sync/tps/extensions/tps/resource/modules/windows.jsm
+++ b/services/sync/tps/extensions/tps/resource/modules/windows.jsm
@@ -10,8 +10,6 @@
const EXPORTED_SYMBOLS = ["BrowserWindows"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var BrowserWindows = {
/**
* Add
diff --git a/services/sync/tps/extensions/tps/resource/tps.jsm b/services/sync/tps/extensions/tps/resource/tps.jsm
index f36418efdf153..0c3ad3af2a0a5 100644
--- a/services/sync/tps/extensions/tps/resource/tps.jsm
+++ b/services/sync/tps/extensions/tps/resource/tps.jsm
@@ -26,7 +26,6 @@ var EXPORTED_SYMBOLS = [
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/storage/test/unit/VacuumParticipant.jsm b/storage/test/unit/VacuumParticipant.jsm
index 764b996a3a613..330a07f19f13c 100644
--- a/storage/test/unit/VacuumParticipant.jsm
+++ b/storage/test/unit/VacuumParticipant.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["VacuumParticipant"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
/**
* Returns a new nsIFile reference for a profile database.
* @param filename for the database, excluded the .sqlite extension.
diff --git a/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm b/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
index 02b0a3ae2c458..4243309b1d53f 100644
--- a/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
+++ b/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
@@ -25,7 +25,6 @@ const { ComponentUtils } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
);
diff --git a/testing/mochitest/BrowserTestUtils/BrowserTestUtilsChild.jsm b/testing/mochitest/BrowserTestUtils/BrowserTestUtilsChild.jsm
index e0b82545be7d2..7a1c006bba563 100644
--- a/testing/mochitest/BrowserTestUtils/BrowserTestUtilsChild.jsm
+++ b/testing/mochitest/BrowserTestUtils/BrowserTestUtilsChild.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["BrowserTestUtilsChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/testing/mochitest/BrowserTestUtils/ContentEventListenerChild.jsm b/testing/mochitest/BrowserTestUtils/ContentEventListenerChild.jsm
index 4242f8b448ada..2222e519f39c8 100644
--- a/testing/mochitest/BrowserTestUtils/ContentEventListenerChild.jsm
+++ b/testing/mochitest/BrowserTestUtils/ContentEventListenerChild.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["ContentEventListenerChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
class ContentEventListenerChild extends JSWindowActorChild {
actorCreated() {
this._contentEvents = new Map();
diff --git a/testing/mochitest/BrowserTestUtils/ContentTask.jsm b/testing/mochitest/BrowserTestUtils/ContentTask.jsm
index a32f673f2d6a9..eb4d56eadf651 100644
--- a/testing/mochitest/BrowserTestUtils/ContentTask.jsm
+++ b/testing/mochitest/BrowserTestUtils/ContentTask.jsm
@@ -8,8 +8,6 @@
var EXPORTED_SYMBOLS = ["ContentTask"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const FRAME_SCRIPT = "resource://testing-common/content-task.js";
/**
diff --git a/testing/mochitest/BrowserTestUtils/ContentTaskUtils.jsm b/testing/mochitest/BrowserTestUtils/ContentTaskUtils.jsm
index 91b1ed532730f..2ee4d95087bdb 100644
--- a/testing/mochitest/BrowserTestUtils/ContentTaskUtils.jsm
+++ b/testing/mochitest/BrowserTestUtils/ContentTaskUtils.jsm
@@ -18,7 +18,6 @@
var EXPORTED_SYMBOLS = ["ContentTaskUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
var ContentTaskUtils = {
diff --git a/testing/mochitest/ShutdownLeaksCollector.jsm b/testing/mochitest/ShutdownLeaksCollector.jsm
index e6cd95831ddf8..b2985a5ba24e7 100644
--- a/testing/mochitest/ShutdownLeaksCollector.jsm
+++ b/testing/mochitest/ShutdownLeaksCollector.jsm
@@ -2,7 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
var EXPORTED_SYMBOLS = ["ContentCollector"];
diff --git a/testing/modules/AppData.jsm b/testing/modules/AppData.jsm
index 318b40fc60c17..d9375af3c5618 100644
--- a/testing/modules/AppData.jsm
+++ b/testing/modules/AppData.jsm
@@ -7,7 +7,6 @@
var EXPORTED_SYMBOLS = ["makeFakeAppDir"];
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Reference needed in order for fake app dir provider to be active.
var gFakeAppDirectoryProvider;
diff --git a/testing/modules/AppInfo.jsm b/testing/modules/AppInfo.jsm
index 1a20ae33948fe..24f39104cccb8 100644
--- a/testing/modules/AppInfo.jsm
+++ b/testing/modules/AppInfo.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["newAppInfo", "getAppInfo", "updateAppInfo"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
let origPlatformInfo = Cc["@mozilla.org/xre/app-info;1"].getService(
Ci.nsIPlatformInfo
);
diff --git a/testing/modules/MockRegistrar.jsm b/testing/modules/MockRegistrar.jsm
index 17ef5069c4f2d..93332b4937d8d 100644
--- a/testing/modules/MockRegistrar.jsm
+++ b/testing/modules/MockRegistrar.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["MockRegistrar"];
const Cm = Components.manager;
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var logger = Log.repository.getLogger("MockRegistrar");
var MockRegistrar = Object.freeze({
diff --git a/testing/modules/MockRegistry.jsm b/testing/modules/MockRegistry.jsm
index 5614db07e87dd..55919cb9a7295 100644
--- a/testing/modules/MockRegistry.jsm
+++ b/testing/modules/MockRegistry.jsm
@@ -10,8 +10,6 @@ const { MockRegistrar } = ChromeUtils.import(
"resource://testing-common/MockRegistrar.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
class MockRegistry {
constructor() {
// Three level structure of Maps pointing to Maps pointing to Maps
diff --git a/testing/modules/Sinon.jsm b/testing/modules/Sinon.jsm
index 07f906f78225a..0f4bd7e6bbae3 100644
--- a/testing/modules/Sinon.jsm
+++ b/testing/modules/Sinon.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["sinon"];
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
// ================================================
// Load mocking/stubbing library sinon
// docs: http://sinonjs.org/releases/v7.2.7/
diff --git a/testing/modules/TestUtils.jsm b/testing/modules/TestUtils.jsm
index 6c81af434da41..d878b3bcf239f 100644
--- a/testing/modules/TestUtils.jsm
+++ b/testing/modules/TestUtils.jsm
@@ -20,7 +20,6 @@
var EXPORTED_SYMBOLS = ["TestUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { clearTimeout, setTimeout } = ChromeUtils.import(
"resource://gre/modules/Timer.jsm"
);
diff --git a/testing/modules/XPCShellContentUtils.jsm b/testing/modules/XPCShellContentUtils.jsm
index e5214eacd90bf..302893630db59 100644
--- a/testing/modules/XPCShellContentUtils.jsm
+++ b/testing/modules/XPCShellContentUtils.jsm
@@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = ["XPCShellContentUtils"];
const { ExtensionUtils } = ChromeUtils.import(
"resource://gre/modules/ExtensionUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
@@ -47,9 +46,6 @@ function frameScript() {
const { MessageChannel } = ChromeUtils.import(
"resource://testing-common/MessageChannel.jsm"
);
- const { Services } = ChromeUtils.import(
- "resource://gre/modules/Services.jsm"
- );
// We need to make sure that the ExtensionPolicy service has been initialized
// as it sets up the observers that inject extension content scripts.
diff --git a/testing/specialpowers/content/AppTestDelegateParent.jsm b/testing/specialpowers/content/AppTestDelegateParent.jsm
index a0dc08c7b3d61..299aa0606d7ef 100644
--- a/testing/specialpowers/content/AppTestDelegateParent.jsm
+++ b/testing/specialpowers/content/AppTestDelegateParent.jsm
@@ -9,7 +9,6 @@ const EXPORTED_SYMBOLS = ["AppTestDelegateParent"];
var { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/testing/specialpowers/content/MockColorPicker.jsm b/testing/specialpowers/content/MockColorPicker.jsm
index 794fb3ddcdcf5..e71ec543ccec0 100644
--- a/testing/specialpowers/content/MockColorPicker.jsm
+++ b/testing/specialpowers/content/MockColorPicker.jsm
@@ -11,7 +11,6 @@ ChromeUtils.defineModuleGetter(
"WrapPrivileged",
"resource://specialpowers/WrapPrivileged.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const Cm = Components.manager;
diff --git a/testing/specialpowers/content/MockFilePicker.jsm b/testing/specialpowers/content/MockFilePicker.jsm
index e0922569d6376..630c6ca7a2bd9 100644
--- a/testing/specialpowers/content/MockFilePicker.jsm
+++ b/testing/specialpowers/content/MockFilePicker.jsm
@@ -21,7 +21,6 @@ ChromeUtils.defineModuleGetter(
"FileUtils",
"resource://gre/modules/FileUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
/* globals __URI__ */
if (__URI__.includes("specialpowers")) {
diff --git a/testing/specialpowers/content/MockPermissionPrompt.jsm b/testing/specialpowers/content/MockPermissionPrompt.jsm
index 9ef4ba496c265..4bf11be3aed9c 100644
--- a/testing/specialpowers/content/MockPermissionPrompt.jsm
+++ b/testing/specialpowers/content/MockPermissionPrompt.jsm
@@ -8,8 +8,6 @@ const Cm = Components.manager;
const CONTRACT_ID = "@mozilla.org/content-permission/prompt;1";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
var oldClassID, oldFactory;
var newClassID = Services.uuid.generateUUID();
diff --git a/testing/specialpowers/content/SpecialPowersChild.jsm b/testing/specialpowers/content/SpecialPowersChild.jsm
index 907a9525c0cc7..bcb958444ba11 100644
--- a/testing/specialpowers/content/SpecialPowersChild.jsm
+++ b/testing/specialpowers/content/SpecialPowersChild.jsm
@@ -8,8 +8,6 @@
var EXPORTED_SYMBOLS = ["SpecialPowersChild"];
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { ExtensionUtils } = ChromeUtils.import(
"resource://gre/modules/ExtensionUtils.jsm"
);
diff --git a/testing/specialpowers/content/SpecialPowersEventUtils.jsm b/testing/specialpowers/content/SpecialPowersEventUtils.jsm
index e1557d509dc6c..e42b19985af3e 100644
--- a/testing/specialpowers/content/SpecialPowersEventUtils.jsm
+++ b/testing/specialpowers/content/SpecialPowersEventUtils.jsm
@@ -11,8 +11,6 @@ var EXPORTED_SYMBOLS = ["EventUtils"];
* content tasks without holding any direct references to windows.
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
let EventUtils = {};
EventUtils.window = {};
diff --git a/testing/specialpowers/content/SpecialPowersParent.jsm b/testing/specialpowers/content/SpecialPowersParent.jsm
index f4ddc92577252..d966c29071f40 100644
--- a/testing/specialpowers/content/SpecialPowersParent.jsm
+++ b/testing/specialpowers/content/SpecialPowersParent.jsm
@@ -12,7 +12,6 @@ const { AppConstants } = ChromeUtils.import(
var { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/testing/talos/talos/talos-powers/content/TalosParentProfiler.jsm b/testing/talos/talos/talos-powers/content/TalosParentProfiler.jsm
index 080fa310dc809..f73dc89749c0b 100644
--- a/testing/talos/talos/talos-powers/content/TalosParentProfiler.jsm
+++ b/testing/talos/talos/talos-powers/content/TalosParentProfiler.jsm
@@ -16,8 +16,6 @@
var EXPORTED_SYMBOLS = ["TalosParentProfiler"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const TalosParentProfiler = {
// Whether or not this TalosContentProfiler object has had initFromObject
// or initFromURLQueryParams called on it. Any functions that change the
diff --git a/toolkit/actors/AboutHttpsOnlyErrorChild.jsm b/toolkit/actors/AboutHttpsOnlyErrorChild.jsm
index 4917e4d2fad8b..c6d3542158181 100644
--- a/toolkit/actors/AboutHttpsOnlyErrorChild.jsm
+++ b/toolkit/actors/AboutHttpsOnlyErrorChild.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["AboutHttpsOnlyErrorChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/actors/AboutHttpsOnlyErrorParent.jsm b/toolkit/actors/AboutHttpsOnlyErrorParent.jsm
index 1094126816f6f..1e79655540b43 100644
--- a/toolkit/actors/AboutHttpsOnlyErrorParent.jsm
+++ b/toolkit/actors/AboutHttpsOnlyErrorParent.jsm
@@ -10,7 +10,6 @@ const { HomePage } = ChromeUtils.import("resource:///modules/HomePage.jsm");
const { PrivateBrowsingUtils } = ChromeUtils.import(
"resource://gre/modules/PrivateBrowsingUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
class AboutHttpsOnlyErrorParent extends JSWindowActorParent {
get browser() {
diff --git a/toolkit/actors/AutoCompleteChild.jsm b/toolkit/actors/AutoCompleteChild.jsm
index c2f6834e5c744..3dd5a012ad230 100644
--- a/toolkit/actors/AutoCompleteChild.jsm
+++ b/toolkit/actors/AutoCompleteChild.jsm
@@ -7,8 +7,6 @@ var EXPORTED_SYMBOLS = ["AutoCompleteChild"];
/* eslint no-unused-vars: ["error", {args: "none"}] */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/actors/AutoCompleteParent.jsm b/toolkit/actors/AutoCompleteParent.jsm
index 90b044dea0c31..ddd70318752d8 100644
--- a/toolkit/actors/AutoCompleteParent.jsm
+++ b/toolkit/actors/AutoCompleteParent.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["AutoCompleteParent"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/actors/AutoScrollChild.jsm b/toolkit/actors/AutoScrollChild.jsm
index 90870fa7f8957..1e0652385d1be 100644
--- a/toolkit/actors/AutoScrollChild.jsm
+++ b/toolkit/actors/AutoScrollChild.jsm
@@ -5,8 +5,6 @@
var EXPORTED_SYMBOLS = ["AutoScrollChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/actors/AutoScrollParent.jsm b/toolkit/actors/AutoScrollParent.jsm
index ec0fa2d1b9dee..ec120f1830277 100644
--- a/toolkit/actors/AutoScrollParent.jsm
+++ b/toolkit/actors/AutoScrollParent.jsm
@@ -4,8 +4,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var EXPORTED_SYMBOLS = ["AutoScrollParent"];
class AutoScrollParent extends JSWindowActorParent {
diff --git a/toolkit/actors/BackgroundThumbnailsChild.jsm b/toolkit/actors/BackgroundThumbnailsChild.jsm
index 27ab5b7f2edbf..4d1ff37a440fd 100644
--- a/toolkit/actors/BackgroundThumbnailsChild.jsm
+++ b/toolkit/actors/BackgroundThumbnailsChild.jsm
@@ -5,7 +5,6 @@
"use strict";
var EXPORTED_SYMBOLS = ["BackgroundThumbnailsChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/actors/ContentMetaChild.jsm b/toolkit/actors/ContentMetaChild.jsm
index c1c4e4b883dfd..1d20edd3d1c14 100644
--- a/toolkit/actors/ContentMetaChild.jsm
+++ b/toolkit/actors/ContentMetaChild.jsm
@@ -6,8 +6,6 @@
const EXPORTED_SYMBOLS = ["ContentMetaChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
// Debounce time in milliseconds - this should be long enough to account for
// sync script tags that could appear between desired meta tags
const TIMEOUT_DELAY = 1000;
diff --git a/toolkit/actors/DateTimePickerChild.jsm b/toolkit/actors/DateTimePickerChild.jsm
index 916f465d5379f..40ffdc1ba6772 100644
--- a/toolkit/actors/DateTimePickerChild.jsm
+++ b/toolkit/actors/DateTimePickerChild.jsm
@@ -2,7 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/toolkit/actors/DateTimePickerParent.jsm b/toolkit/actors/DateTimePickerParent.jsm
index e7a1f5771206f..59425aed4dc44 100644
--- a/toolkit/actors/DateTimePickerParent.jsm
+++ b/toolkit/actors/DateTimePickerParent.jsm
@@ -13,7 +13,6 @@ function debug(aStr) {
var EXPORTED_SYMBOLS = ["DateTimePickerParent"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/toolkit/actors/FindBarChild.jsm b/toolkit/actors/FindBarChild.jsm
index 0ab4924240d77..d35397fecafa7 100644
--- a/toolkit/actors/FindBarChild.jsm
+++ b/toolkit/actors/FindBarChild.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["FindBarChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/actors/KeyPressEventModelCheckerChild.jsm b/toolkit/actors/KeyPressEventModelCheckerChild.jsm
index ba3980acff78f..8461f6a8a295f 100644
--- a/toolkit/actors/KeyPressEventModelCheckerChild.jsm
+++ b/toolkit/actors/KeyPressEventModelCheckerChild.jsm
@@ -11,7 +11,6 @@ var EXPORTED_SYMBOLS = ["KeyPressEventModelCheckerChild"];
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
class KeyPressEventModelCheckerChild extends JSWindowActorChild {
// Currently, the event is dispatched only when the document becomes editable
diff --git a/toolkit/actors/PictureInPictureChild.jsm b/toolkit/actors/PictureInPictureChild.jsm
index 2093787204e04..9375e871cafd8 100644
--- a/toolkit/actors/PictureInPictureChild.jsm
+++ b/toolkit/actors/PictureInPictureChild.jsm
@@ -17,7 +17,6 @@ ChromeUtils.defineModuleGetter(
"DeferredTask",
"resource://gre/modules/DeferredTask.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(
lazy,
"KEYBOARD_CONTROLS",
diff --git a/toolkit/actors/PrintingChild.jsm b/toolkit/actors/PrintingChild.jsm
index f295452a88366..2a15027a45784 100644
--- a/toolkit/actors/PrintingChild.jsm
+++ b/toolkit/actors/PrintingChild.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["PrintingChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/actors/RemotePageChild.jsm b/toolkit/actors/RemotePageChild.jsm
index 2e726d17665b4..589fca44318df 100644
--- a/toolkit/actors/RemotePageChild.jsm
+++ b/toolkit/actors/RemotePageChild.jsm
@@ -14,7 +14,6 @@ var EXPORTED_SYMBOLS = ["RemotePageChild"];
* directly to the page.
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/toolkit/actors/TestProcessActorChild.jsm b/toolkit/actors/TestProcessActorChild.jsm
index 1d621b7dc8904..20b7382624789 100644
--- a/toolkit/actors/TestProcessActorChild.jsm
+++ b/toolkit/actors/TestProcessActorChild.jsm
@@ -4,8 +4,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var EXPORTED_SYMBOLS = ["TestProcessActorChild"];
class TestProcessActorChild extends JSProcessActorChild {
diff --git a/toolkit/actors/TestWindowChild.jsm b/toolkit/actors/TestWindowChild.jsm
index b233dfd9bb0df..127c03fa0eb2d 100644
--- a/toolkit/actors/TestWindowChild.jsm
+++ b/toolkit/actors/TestWindowChild.jsm
@@ -4,8 +4,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var EXPORTED_SYMBOLS = ["TestWindowChild"];
var docShellThunks = new Map();
diff --git a/toolkit/actors/TestWindowParent.jsm b/toolkit/actors/TestWindowParent.jsm
index ee5dcab4692fa..5c368d33211d1 100644
--- a/toolkit/actors/TestWindowParent.jsm
+++ b/toolkit/actors/TestWindowParent.jsm
@@ -4,8 +4,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var EXPORTED_SYMBOLS = ["TestWindowParent"];
class TestWindowParent extends JSWindowActorParent {
diff --git a/toolkit/actors/ThumbnailsChild.jsm b/toolkit/actors/ThumbnailsChild.jsm
index 782e30f301ee5..2db728c734d38 100644
--- a/toolkit/actors/ThumbnailsChild.jsm
+++ b/toolkit/actors/ThumbnailsChild.jsm
@@ -5,7 +5,6 @@
"use strict";
var EXPORTED_SYMBOLS = ["ThumbnailsChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/actors/UAWidgetsChild.jsm b/toolkit/actors/UAWidgetsChild.jsm
index 44db5b8c1d100..59c472ad52465 100644
--- a/toolkit/actors/UAWidgetsChild.jsm
+++ b/toolkit/actors/UAWidgetsChild.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["UAWidgetsChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
class UAWidgetsChild extends JSWindowActorChild {
constructor() {
super();
diff --git a/toolkit/actors/UnselectedTabHoverChild.jsm b/toolkit/actors/UnselectedTabHoverChild.jsm
index 1c3076462b658..d5cf17c89ff9b 100644
--- a/toolkit/actors/UnselectedTabHoverChild.jsm
+++ b/toolkit/actors/UnselectedTabHoverChild.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["UnselectedTabHoverChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
class UnselectedTabHoverChild extends JSWindowActorChild {
receiveMessage(message) {
Services.obs.notifyObservers(
diff --git a/toolkit/actors/ViewSourceChild.jsm b/toolkit/actors/ViewSourceChild.jsm
index 90633ed83b06d..74aeb3947c73c 100644
--- a/toolkit/actors/ViewSourceChild.jsm
+++ b/toolkit/actors/ViewSourceChild.jsm
@@ -5,8 +5,6 @@
var EXPORTED_SYMBOLS = ["ViewSourceChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/actors/ViewSourcePageChild.jsm b/toolkit/actors/ViewSourcePageChild.jsm
index b8dbc4715724e..53bf816ce932d 100644
--- a/toolkit/actors/ViewSourcePageChild.jsm
+++ b/toolkit/actors/ViewSourcePageChild.jsm
@@ -4,7 +4,6 @@
/* eslint-env mozilla/frame-script */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/actors/ViewSourcePageParent.jsm b/toolkit/actors/ViewSourcePageParent.jsm
index 19691f2197be3..b39cbd0bb4742 100644
--- a/toolkit/actors/ViewSourcePageParent.jsm
+++ b/toolkit/actors/ViewSourcePageParent.jsm
@@ -4,8 +4,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const BUNDLE_URL = "chrome://global/locale/viewSource.properties";
var EXPORTED_SYMBOLS = ["ViewSourcePageParent"];
diff --git a/toolkit/actors/WebChannelChild.jsm b/toolkit/actors/WebChannelChild.jsm
index ccdab327a1049..eebd42aed56e8 100644
--- a/toolkit/actors/WebChannelChild.jsm
+++ b/toolkit/actors/WebChannelChild.jsm
@@ -7,7 +7,6 @@
var EXPORTED_SYMBOLS = ["WebChannelChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/DefaultCLH.jsm b/toolkit/components/DefaultCLH.jsm
index 553a2f06885c7..d4b104b1b960b 100644
--- a/toolkit/components/DefaultCLH.jsm
+++ b/toolkit/components/DefaultCLH.jsm
@@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const nsICommandLineHandler = Ci.nsICommandLineHandler;
const nsIPrefBranch = Ci.nsIPrefBranch;
const nsIWindowWatcher = Ci.nsIWindowWatcher;
diff --git a/toolkit/components/antitracking/ContentBlockingAllowList.jsm b/toolkit/components/antitracking/ContentBlockingAllowList.jsm
index 9b96deb9d520d..4fb66bee246a2 100644
--- a/toolkit/components/antitracking/ContentBlockingAllowList.jsm
+++ b/toolkit/components/antitracking/ContentBlockingAllowList.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["ContentBlockingAllowList"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/components/antitracking/PartitioningExceptionListService.jsm b/toolkit/components/antitracking/PartitioningExceptionListService.jsm
index bc2f833cb5dd8..99e88e810e7f6 100644
--- a/toolkit/components/antitracking/PartitioningExceptionListService.jsm
+++ b/toolkit/components/antitracking/PartitioningExceptionListService.jsm
@@ -4,8 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/components/antitracking/PurgeTrackerService.jsm b/toolkit/components/antitracking/PurgeTrackerService.jsm
index 5ea98a741adbb..5a1c54334c7b8 100644
--- a/toolkit/components/antitracking/PurgeTrackerService.jsm
+++ b/toolkit/components/antitracking/PurgeTrackerService.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["PurgeTrackerService"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const THREE_DAYS_MS = 3 * 24 * 60 * 1000;
diff --git a/toolkit/components/antitracking/TrackingDBService.jsm b/toolkit/components/antitracking/TrackingDBService.jsm
index a6de30b87b794..9b2bca3a84c21 100644
--- a/toolkit/components/antitracking/TrackingDBService.jsm
+++ b/toolkit/components/antitracking/TrackingDBService.jsm
@@ -9,7 +9,6 @@ const { XPCOMUtils } = ChromeUtils.import(
);
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
const { Sqlite } = ChromeUtils.import("resource://gre/modules/Sqlite.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const SCHEMA_VERSION = 1;
const TRACKERS_BLOCKED_COUNT = "contentblocking.trackers_blocked_count";
diff --git a/toolkit/components/antitracking/URLDecorationAnnotationsService.jsm b/toolkit/components/antitracking/URLDecorationAnnotationsService.jsm
index 71b94edd4eeb7..e1c038679d3bd 100644
--- a/toolkit/components/antitracking/URLDecorationAnnotationsService.jsm
+++ b/toolkit/components/antitracking/URLDecorationAnnotationsService.jsm
@@ -12,8 +12,6 @@ ChromeUtils.defineModuleGetter(
"resource://services-settings/remote-settings.js"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const COLLECTION_NAME = "anti-tracking-url-decoration";
const PREF_NAME = "privacy.restrict3rdpartystorage.url_decorations";
diff --git a/toolkit/components/antitracking/URLQueryStrippingListService.jsm b/toolkit/components/antitracking/URLQueryStrippingListService.jsm
index 6432d7bc39c56..942d79709e7c5 100644
--- a/toolkit/components/antitracking/URLQueryStrippingListService.jsm
+++ b/toolkit/components/antitracking/URLQueryStrippingListService.jsm
@@ -7,7 +7,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/asyncshutdown/AsyncShutdown.jsm b/toolkit/components/asyncshutdown/AsyncShutdown.jsm
index 718df9ce4b392..d1287e0a1eee4 100644
--- a/toolkit/components/asyncshutdown/AsyncShutdown.jsm
+++ b/toolkit/components/asyncshutdown/AsyncShutdown.jsm
@@ -41,7 +41,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/backgroundhangmonitor/BHRTelemetryService.jsm b/toolkit/components/backgroundhangmonitor/BHRTelemetryService.jsm
index 51ab06f12fa30..4853d7cf7febc 100644
--- a/toolkit/components/backgroundhangmonitor/BHRTelemetryService.jsm
+++ b/toolkit/components/backgroundhangmonitor/BHRTelemetryService.jsm
@@ -4,8 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(lazy, "OS", "resource://gre/modules/osfile.jsm");
diff --git a/toolkit/components/backgroundtasks/BackgroundTasksManager.jsm b/toolkit/components/backgroundtasks/BackgroundTasksManager.jsm
index b18cb05ebaf2b..bfbf60e4b9bcc 100644
--- a/toolkit/components/backgroundtasks/BackgroundTasksManager.jsm
+++ b/toolkit/components/backgroundtasks/BackgroundTasksManager.jsm
@@ -5,7 +5,6 @@
var EXPORTED_SYMBOLS = ["BackgroundTasksManager"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/backgroundtasks/BackgroundTasksTestUtils.jsm b/toolkit/components/backgroundtasks/BackgroundTasksTestUtils.jsm
index ba54dcde6103b..ec129506260fe 100644
--- a/toolkit/components/backgroundtasks/BackgroundTasksTestUtils.jsm
+++ b/toolkit/components/backgroundtasks/BackgroundTasksTestUtils.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["BackgroundTasksTestUtils"];
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { Subprocess } = ChromeUtils.import(
"resource://gre/modules/Subprocess.jsm"
);
diff --git a/toolkit/components/backgroundtasks/BackgroundTasksUtils.jsm b/toolkit/components/backgroundtasks/BackgroundTasksUtils.jsm
index bd18a96def99e..3888e4a65ccea 100644
--- a/toolkit/components/backgroundtasks/BackgroundTasksUtils.jsm
+++ b/toolkit/components/backgroundtasks/BackgroundTasksUtils.jsm
@@ -5,7 +5,6 @@
var EXPORTED_SYMBOLS = ["BackgroundTasksUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/backgroundtasks/tests/BackgroundTask_backgroundtask_specific_pref.jsm b/toolkit/components/backgroundtasks/tests/BackgroundTask_backgroundtask_specific_pref.jsm
index 0fa900f04f5e4..dc0a1dab6a5e5 100644
--- a/toolkit/components/backgroundtasks/tests/BackgroundTask_backgroundtask_specific_pref.jsm
+++ b/toolkit/components/backgroundtasks/tests/BackgroundTask_backgroundtask_specific_pref.jsm
@@ -5,8 +5,6 @@
var EXPORTED_SYMBOLS = ["runBackgroundTask"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
async function runBackgroundTask(commandLine) {
let pref = commandLine.length
? commandLine.getArgument(0)
diff --git a/toolkit/components/backgroundtasks/tests/BackgroundTask_crash.jsm b/toolkit/components/backgroundtasks/tests/BackgroundTask_crash.jsm
index fb64983e12f60..d951b5b8f53ae 100644
--- a/toolkit/components/backgroundtasks/tests/BackgroundTask_crash.jsm
+++ b/toolkit/components/backgroundtasks/tests/BackgroundTask_crash.jsm
@@ -5,8 +5,6 @@
var EXPORTED_SYMBOLS = ["runBackgroundTask"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
async function runBackgroundTask(commandLine) {
// This task depends on `CrashTestUtils.jsm` and requires the
// sibling `testcrasher` library to be in the current working
diff --git a/toolkit/components/backgroundtasks/tests/BackgroundTask_unique_profile.jsm b/toolkit/components/backgroundtasks/tests/BackgroundTask_unique_profile.jsm
index 874b43a746819..b6edfafbdbad2 100644
--- a/toolkit/components/backgroundtasks/tests/BackgroundTask_unique_profile.jsm
+++ b/toolkit/components/backgroundtasks/tests/BackgroundTask_unique_profile.jsm
@@ -7,7 +7,6 @@
var EXPORTED_SYMBOLS = ["runBackgroundTask"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { Subprocess } = ChromeUtils.import(
"resource://gre/modules/Subprocess.jsm"
);
diff --git a/toolkit/components/captivedetect/CaptiveDetect.jsm b/toolkit/components/captivedetect/CaptiveDetect.jsm
index 0000adab6ec6e..b181ae3f2e8b3 100644
--- a/toolkit/components/captivedetect/CaptiveDetect.jsm
+++ b/toolkit/components/captivedetect/CaptiveDetect.jsm
@@ -5,8 +5,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const DEBUG = false; // set to true to show debug messages
const kCAPTIVEPORTALDETECTOR_CID = Components.ID(
diff --git a/toolkit/components/cleardata/ClearDataService.jsm b/toolkit/components/cleardata/ClearDataService.jsm
index 21b62d0b4a92c..097654fd0226f 100644
--- a/toolkit/components/cleardata/ClearDataService.jsm
+++ b/toolkit/components/cleardata/ClearDataService.jsm
@@ -7,7 +7,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/cleardata/PrincipalsCollector.jsm b/toolkit/components/cleardata/PrincipalsCollector.jsm
index 7ee9bf76cfeea..49271d34a60c7 100644
--- a/toolkit/components/cleardata/PrincipalsCollector.jsm
+++ b/toolkit/components/cleardata/PrincipalsCollector.jsm
@@ -4,8 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/cleardata/ServiceWorkerCleanUp.jsm b/toolkit/components/cleardata/ServiceWorkerCleanUp.jsm
index 8a5d4821aaecc..1d419b9ac17f4 100644
--- a/toolkit/components/cleardata/ServiceWorkerCleanUp.jsm
+++ b/toolkit/components/cleardata/ServiceWorkerCleanUp.jsm
@@ -7,7 +7,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/cleardata/SiteDataTestUtils.jsm b/toolkit/components/cleardata/SiteDataTestUtils.jsm
index 9741cfc85662b..926d7f151ef9e 100644
--- a/toolkit/components/cleardata/SiteDataTestUtils.jsm
+++ b/toolkit/components/cleardata/SiteDataTestUtils.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["SiteDataTestUtils"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { BrowserTestUtils } = ChromeUtils.import(
"resource://testing-common/BrowserTestUtils.jsm"
);
diff --git a/toolkit/components/contentprefs/ContentPrefService2.jsm b/toolkit/components/contentprefs/ContentPrefService2.jsm
index 81e067d9ee9e1..611663b60650e 100644
--- a/toolkit/components/contentprefs/ContentPrefService2.jsm
+++ b/toolkit/components/contentprefs/ContentPrefService2.jsm
@@ -2,7 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const {
ContentPref,
cbHandleCompletion,
diff --git a/toolkit/components/contentprefs/ContentPrefServiceChild.jsm b/toolkit/components/contentprefs/ContentPrefServiceChild.jsm
index b9136b8952245..b34e9e7205e73 100644
--- a/toolkit/components/contentprefs/ContentPrefServiceChild.jsm
+++ b/toolkit/components/contentprefs/ContentPrefServiceChild.jsm
@@ -16,8 +16,6 @@ const {
safeCallback,
} = ChromeUtils.import("resource://gre/modules/ContentPrefUtils.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
// We only need one bit of information out of the context.
function contextArg(context) {
return context && context.usePrivateBrowsing
diff --git a/toolkit/components/contentprefs/tests/unit_cps2/AsyncRunner.jsm b/toolkit/components/contentprefs/tests/unit_cps2/AsyncRunner.jsm
index 7a1493bc0cbe0..be2921395fd93 100644
--- a/toolkit/components/contentprefs/tests/unit_cps2/AsyncRunner.jsm
+++ b/toolkit/components/contentprefs/tests/unit_cps2/AsyncRunner.jsm
@@ -4,8 +4,6 @@
var EXPORTED_SYMBOLS = ["AsyncRunner"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
function AsyncRunner(callbacks) {
this._callbacks = callbacks;
this._iteratorQueue = [];
diff --git a/toolkit/components/contextualidentity/ContextualIdentityService.jsm b/toolkit/components/contextualidentity/ContextualIdentityService.jsm
index aba067413b4bf..2c23e4a66709f 100644
--- a/toolkit/components/contextualidentity/ContextualIdentityService.jsm
+++ b/toolkit/components/contextualidentity/ContextualIdentityService.jsm
@@ -7,7 +7,6 @@ var EXPORTED_SYMBOLS = ["ContextualIdentityService"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
// The maximum valid numeric value for the userContextId.
const MAX_USER_CONTEXT_ID = -1 >>> 0;
diff --git a/toolkit/components/crashes/CrashManager.in.jsm b/toolkit/components/crashes/CrashManager.in.jsm
index 8d450423fa963..91b65fc6f983a 100644
--- a/toolkit/components/crashes/CrashManager.in.jsm
+++ b/toolkit/components/crashes/CrashManager.in.jsm
@@ -7,7 +7,6 @@
const { PromiseUtils } = ChromeUtils.import(
"resource://gre/modules/PromiseUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
diff --git a/toolkit/components/crashes/CrashManagerTest.jsm b/toolkit/components/crashes/CrashManagerTest.jsm
index 6bca874382f88..3f87e20a0098e 100644
--- a/toolkit/components/crashes/CrashManagerTest.jsm
+++ b/toolkit/components/crashes/CrashManagerTest.jsm
@@ -19,7 +19,6 @@ var EXPORTED_SYMBOLS = [
const { CrashManager } = ChromeUtils.import(
"resource://gre/modules/CrashManager.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/crashes/CrashService.jsm b/toolkit/components/crashes/CrashService.jsm
index 2626b512b96c9..c9452c452c78d 100644
--- a/toolkit/components/crashes/CrashService.jsm
+++ b/toolkit/components/crashes/CrashService.jsm
@@ -10,7 +10,6 @@ const { AppConstants } = ChromeUtils.import(
const { AsyncShutdown } = ChromeUtils.import(
"resource://gre/modules/AsyncShutdown.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Set to true if the application is quitting
var gQuitting = false;
diff --git a/toolkit/components/crashmonitor/CrashMonitor.jsm b/toolkit/components/crashmonitor/CrashMonitor.jsm
index f3710c1bea46e..b01e7e21ac641 100644
--- a/toolkit/components/crashmonitor/CrashMonitor.jsm
+++ b/toolkit/components/crashmonitor/CrashMonitor.jsm
@@ -39,7 +39,6 @@ const { PrivateBrowsingUtils } = ChromeUtils.import(
const { PromiseUtils } = ChromeUtils.import(
"resource://gre/modules/PromiseUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const SESSIONSTORE_WINDOWS_RESTORED_TOPIC = "sessionstore-windows-restored";
const SESSIONSTORE_FINAL_STATE_WRITE_COMPLETE_TOPIC =
diff --git a/toolkit/components/downloads/DownloadCore.jsm b/toolkit/components/downloads/DownloadCore.jsm
index 7b110bb3fede9..92b05910f3e75 100644
--- a/toolkit/components/downloads/DownloadCore.jsm
+++ b/toolkit/components/downloads/DownloadCore.jsm
@@ -25,7 +25,6 @@ const { Integration } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/downloads/DownloadHistory.jsm b/toolkit/components/downloads/DownloadHistory.jsm
index 1621576e120fa..c2bf8815ee70c 100644
--- a/toolkit/components/downloads/DownloadHistory.jsm
+++ b/toolkit/components/downloads/DownloadHistory.jsm
@@ -21,7 +21,6 @@ const { DownloadList } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/downloads/DownloadIntegration.jsm b/toolkit/components/downloads/DownloadIntegration.jsm
index b7665ccd2fe0b..acb8dd9ab1363 100644
--- a/toolkit/components/downloads/DownloadIntegration.jsm
+++ b/toolkit/components/downloads/DownloadIntegration.jsm
@@ -20,7 +20,6 @@ const { Downloads } = ChromeUtils.import(
const { Integration } = ChromeUtils.import(
"resource://gre/modules/Integration.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/downloads/DownloadLegacy.jsm b/toolkit/components/downloads/DownloadLegacy.jsm
index 0ff817a94283f..e26f91f548e67 100644
--- a/toolkit/components/downloads/DownloadLegacy.jsm
+++ b/toolkit/components/downloads/DownloadLegacy.jsm
@@ -14,8 +14,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/components/downloads/DownloadList.jsm b/toolkit/components/downloads/DownloadList.jsm
index c2eeb72682837..02c560b01b24a 100644
--- a/toolkit/components/downloads/DownloadList.jsm
+++ b/toolkit/components/downloads/DownloadList.jsm
@@ -14,8 +14,6 @@ var EXPORTED_SYMBOLS = [
"DownloadSummary",
];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const kFileExtensions = [
"aac",
"adt",
diff --git a/toolkit/components/downloads/DownloadUIHelper.jsm b/toolkit/components/downloads/DownloadUIHelper.jsm
index 0bcf195b30600..513fd37396438 100644
--- a/toolkit/components/downloads/DownloadUIHelper.jsm
+++ b/toolkit/components/downloads/DownloadUIHelper.jsm
@@ -20,7 +20,6 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
ChromeUtils.defineModuleGetter(lazy, "OS", "resource://gre/modules/osfile.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
// BrowserWindowTracker and PrivateBrowsingUtils are only used when opening downloaded files into a browser window
XPCOMUtils.defineLazyModuleGetters(lazy, {
diff --git a/toolkit/components/enterprisepolicies/EnterprisePoliciesContent.jsm b/toolkit/components/enterprisepolicies/EnterprisePoliciesContent.jsm
index ba101cf8143e3..7348c6c1ed3e2 100644
--- a/toolkit/components/enterprisepolicies/EnterprisePoliciesContent.jsm
+++ b/toolkit/components/enterprisepolicies/EnterprisePoliciesContent.jsm
@@ -4,8 +4,6 @@
var EXPORTED_SYMBOLS = ["EnterprisePoliciesManagerContent"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
class EnterprisePoliciesManagerContent {
get status() {
return (
diff --git a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm
index aecb28d95de7c..4e2af89f22be9 100644
--- a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm
+++ b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm
@@ -7,7 +7,6 @@ var EXPORTED_SYMBOLS = ["EnterprisePoliciesManager"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/enterprisepolicies/WindowsGPOParser.jsm b/toolkit/components/enterprisepolicies/WindowsGPOParser.jsm
index 589b7e7167229..3820b1f1b1b5e 100644
--- a/toolkit/components/enterprisepolicies/WindowsGPOParser.jsm
+++ b/toolkit/components/enterprisepolicies/WindowsGPOParser.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/enterprisepolicies/tests/EnterprisePolicyTesting.jsm b/toolkit/components/enterprisepolicies/tests/EnterprisePolicyTesting.jsm
index 9d8531744d18a..b346dfba8be35 100644
--- a/toolkit/components/enterprisepolicies/tests/EnterprisePolicyTesting.jsm
+++ b/toolkit/components/enterprisepolicies/tests/EnterprisePolicyTesting.jsm
@@ -7,7 +7,6 @@
const { Preferences } = ChromeUtils.import(
"resource://gre/modules/Preferences.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
const { Assert } = ChromeUtils.import("resource://testing-common/Assert.jsm");
const lazy = {};
diff --git a/toolkit/components/extensions/Extension.jsm b/toolkit/components/extensions/Extension.jsm
index 3a4a0583543b2..939604f5d7abd 100644
--- a/toolkit/components/extensions/Extension.jsm
+++ b/toolkit/components/extensions/Extension.jsm
@@ -43,7 +43,6 @@ var EXPORTED_SYMBOLS = [
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/extensions/ExtensionActivityLog.jsm b/toolkit/components/extensions/ExtensionActivityLog.jsm
index 4e264da99bf24..97608c1ac283d 100644
--- a/toolkit/components/extensions/ExtensionActivityLog.jsm
+++ b/toolkit/components/extensions/ExtensionActivityLog.jsm
@@ -5,7 +5,6 @@
const EXPORTED_SYMBOLS = ["ExtensionActivityLog"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/extensions/ExtensionChild.jsm b/toolkit/components/extensions/ExtensionChild.jsm
index 80cb1e5989bb9..eb450b7b28b13 100644
--- a/toolkit/components/extensions/ExtensionChild.jsm
+++ b/toolkit/components/extensions/ExtensionChild.jsm
@@ -16,7 +16,6 @@ var EXPORTED_SYMBOLS = ["ExtensionChild", "ExtensionActivityLogChild"];
* Don't put contentscript logic here, use ExtensionContent.jsm instead.
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/extensions/ExtensionChildDevToolsUtils.jsm b/toolkit/components/extensions/ExtensionChildDevToolsUtils.jsm
index b8754b8e04477..7c8910ae1c12b 100644
--- a/toolkit/components/extensions/ExtensionChildDevToolsUtils.jsm
+++ b/toolkit/components/extensions/ExtensionChildDevToolsUtils.jsm
@@ -16,7 +16,6 @@ var EXPORTED_SYMBOLS = ["ExtensionChildDevToolsUtils"];
const { EventEmitter } = ChromeUtils.import(
"resource://gre/modules/EventEmitter.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Create a variable to hold the cached ThemeChangeObserver which does not
// get created until a devtools context has been created.
diff --git a/toolkit/components/extensions/ExtensionCommon.jsm b/toolkit/components/extensions/ExtensionCommon.jsm
index 4eeebe0609022..f646b90af05bc 100644
--- a/toolkit/components/extensions/ExtensionCommon.jsm
+++ b/toolkit/components/extensions/ExtensionCommon.jsm
@@ -15,7 +15,6 @@
var EXPORTED_SYMBOLS = ["ExtensionCommon"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/extensions/ExtensionContent.jsm b/toolkit/components/extensions/ExtensionContent.jsm
index 71be531c7c3dd..5982b8070123c 100644
--- a/toolkit/components/extensions/ExtensionContent.jsm
+++ b/toolkit/components/extensions/ExtensionContent.jsm
@@ -7,7 +7,6 @@
var EXPORTED_SYMBOLS = ["ExtensionContent", "ExtensionContentChild"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/extensions/ExtensionPageChild.jsm b/toolkit/components/extensions/ExtensionPageChild.jsm
index 44fdfc2ade11a..ef17e2f960719 100644
--- a/toolkit/components/extensions/ExtensionPageChild.jsm
+++ b/toolkit/components/extensions/ExtensionPageChild.jsm
@@ -14,8 +14,6 @@ var EXPORTED_SYMBOLS = ["ExtensionPageChild", "getContextChildManagerGetter"];
* child process.
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/components/extensions/ExtensionParent.jsm b/toolkit/components/extensions/ExtensionParent.jsm
index aaffd248ce9c3..d59ed3e6f2c5d 100644
--- a/toolkit/components/extensions/ExtensionParent.jsm
+++ b/toolkit/components/extensions/ExtensionParent.jsm
@@ -15,7 +15,6 @@
var EXPORTED_SYMBOLS = ["ExtensionParent"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/extensions/ExtensionPermissions.jsm b/toolkit/components/extensions/ExtensionPermissions.jsm
index 22a0bc97e9ed9..de0772086370b 100644
--- a/toolkit/components/extensions/ExtensionPermissions.jsm
+++ b/toolkit/components/extensions/ExtensionPermissions.jsm
@@ -11,7 +11,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/extensions/ExtensionPreferencesManager.jsm b/toolkit/components/extensions/ExtensionPreferencesManager.jsm
index d535697a9bd46..b08a218e3f2f6 100644
--- a/toolkit/components/extensions/ExtensionPreferencesManager.jsm
+++ b/toolkit/components/extensions/ExtensionPreferencesManager.jsm
@@ -23,8 +23,6 @@
const EXPORTED_SYMBOLS = ["ExtensionPreferencesManager"];
let ExtensionPreferencesManager;
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { Management } = ChromeUtils.import(
"resource://gre/modules/Extension.jsm"
);
diff --git a/toolkit/components/extensions/ExtensionProcessScript.jsm b/toolkit/components/extensions/ExtensionProcessScript.jsm
index 19ae082a5e3e3..2f6c5ee11300f 100644
--- a/toolkit/components/extensions/ExtensionProcessScript.jsm
+++ b/toolkit/components/extensions/ExtensionProcessScript.jsm
@@ -12,7 +12,6 @@
var EXPORTED_SYMBOLS = ["ExtensionProcessScript", "ExtensionAPIRequestHandler"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/extensions/ExtensionSettingsStore.jsm b/toolkit/components/extensions/ExtensionSettingsStore.jsm
index 34f534a361d6c..03bda1643a543 100644
--- a/toolkit/components/extensions/ExtensionSettingsStore.jsm
+++ b/toolkit/components/extensions/ExtensionSettingsStore.jsm
@@ -45,7 +45,6 @@ var EXPORTED_SYMBOLS = ["ExtensionSettingsStore"];
const { ExtensionParent } = ChromeUtils.import(
"resource://gre/modules/ExtensionParent.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/extensions/ExtensionStorage.jsm b/toolkit/components/extensions/ExtensionStorage.jsm
index ae42f5aeaaf9e..743223d8770ab 100644
--- a/toolkit/components/extensions/ExtensionStorage.jsm
+++ b/toolkit/components/extensions/ExtensionStorage.jsm
@@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = ["ExtensionStorage"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/extensions/ExtensionStorageIDB.jsm b/toolkit/components/extensions/ExtensionStorageIDB.jsm
index b8014bb12cfa4..beac6b821294f 100644
--- a/toolkit/components/extensions/ExtensionStorageIDB.jsm
+++ b/toolkit/components/extensions/ExtensionStorageIDB.jsm
@@ -13,7 +13,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { IndexedDB } = ChromeUtils.import(
"resource://gre/modules/IndexedDB.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/extensions/ExtensionStorageSyncKinto.jsm b/toolkit/components/extensions/ExtensionStorageSyncKinto.jsm
index 82a667540bfd3..411a85862a516 100644
--- a/toolkit/components/extensions/ExtensionStorageSyncKinto.jsm
+++ b/toolkit/components/extensions/ExtensionStorageSyncKinto.jsm
@@ -42,7 +42,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { ExtensionUtils } = ChromeUtils.import(
"resource://gre/modules/ExtensionUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/extensions/ExtensionTelemetry.jsm b/toolkit/components/extensions/ExtensionTelemetry.jsm
index 1fd6f5607cffd..3519c1905a6fb 100644
--- a/toolkit/components/extensions/ExtensionTelemetry.jsm
+++ b/toolkit/components/extensions/ExtensionTelemetry.jsm
@@ -11,8 +11,6 @@ var EXPORTED_SYMBOLS = [
"getErrorNameForTelemetry",
];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
// Map of the base histogram ids for the metrics recorded for the extensions.
const histograms = {
extensionStartup: "WEBEXT_EXTENSION_STARTUP_MS",
diff --git a/toolkit/components/extensions/ExtensionTestCommon.jsm b/toolkit/components/extensions/ExtensionTestCommon.jsm
index c3a4b694abc14..3e418ffbda3fb 100644
--- a/toolkit/components/extensions/ExtensionTestCommon.jsm
+++ b/toolkit/components/extensions/ExtensionTestCommon.jsm
@@ -14,7 +14,6 @@
var EXPORTED_SYMBOLS = ["ExtensionTestCommon", "MockExtension"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/extensions/ExtensionUtils.jsm b/toolkit/components/extensions/ExtensionUtils.jsm
index 8eae43d872973..14856349dc7f3 100644
--- a/toolkit/components/extensions/ExtensionUtils.jsm
+++ b/toolkit/components/extensions/ExtensionUtils.jsm
@@ -7,7 +7,6 @@
var EXPORTED_SYMBOLS = ["ExtensionUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/extensions/ExtensionWorkerChild.jsm b/toolkit/components/extensions/ExtensionWorkerChild.jsm
index db809e885ab68..2511cd959584d 100644
--- a/toolkit/components/extensions/ExtensionWorkerChild.jsm
+++ b/toolkit/components/extensions/ExtensionWorkerChild.jsm
@@ -14,8 +14,6 @@ var EXPORTED_SYMBOLS = ["ExtensionWorkerChild"];
* child process.
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { ExtensionChild, ExtensionActivityLogChild } = ChromeUtils.import(
"resource://gre/modules/ExtensionChild.jsm"
);
diff --git a/toolkit/components/extensions/ExtensionXPCShellUtils.jsm b/toolkit/components/extensions/ExtensionXPCShellUtils.jsm
index d30d634c5319e..31c78c18276d8 100644
--- a/toolkit/components/extensions/ExtensionXPCShellUtils.jsm
+++ b/toolkit/components/extensions/ExtensionXPCShellUtils.jsm
@@ -46,7 +46,6 @@ ChromeUtils.defineModuleGetter(
"Schemas",
"resource://gre/modules/Schemas.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
let BASE_MANIFEST = Object.freeze({
applications: Object.freeze({
diff --git a/toolkit/components/extensions/MatchURLFilters.jsm b/toolkit/components/extensions/MatchURLFilters.jsm
index 3c7c09853173f..7dc6fe8e08d0d 100644
--- a/toolkit/components/extensions/MatchURLFilters.jsm
+++ b/toolkit/components/extensions/MatchURLFilters.jsm
@@ -4,8 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
/* exported MatchURLFilters */
var EXPORTED_SYMBOLS = ["MatchURLFilters"];
diff --git a/toolkit/components/extensions/MessageChannel.jsm b/toolkit/components/extensions/MessageChannel.jsm
index 218186bcad295..ef7347a487c33 100644
--- a/toolkit/components/extensions/MessageChannel.jsm
+++ b/toolkit/components/extensions/MessageChannel.jsm
@@ -106,7 +106,6 @@ const { AppConstants } = ChromeUtils.import(
const { ExtensionUtils } = ChromeUtils.import(
"resource://gre/modules/ExtensionUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/extensions/MessageManagerProxy.jsm b/toolkit/components/extensions/MessageManagerProxy.jsm
index 91b06a6e63a03..71eb16e4256cd 100644
--- a/toolkit/components/extensions/MessageManagerProxy.jsm
+++ b/toolkit/components/extensions/MessageManagerProxy.jsm
@@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = ["MessageManagerProxy"];
const { ExtensionUtils } = ChromeUtils.import(
"resource://gre/modules/ExtensionUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { DefaultMap } = ExtensionUtils;
diff --git a/toolkit/components/extensions/NativeManifests.jsm b/toolkit/components/extensions/NativeManifests.jsm
index 8e801f3442dd5..ecfbf20af6d6d 100644
--- a/toolkit/components/extensions/NativeManifests.jsm
+++ b/toolkit/components/extensions/NativeManifests.jsm
@@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = ["NativeManifests"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/extensions/NativeMessaging.jsm b/toolkit/components/extensions/NativeMessaging.jsm
index d7cb0ea2a1035..4871d02ac01ec 100644
--- a/toolkit/components/extensions/NativeMessaging.jsm
+++ b/toolkit/components/extensions/NativeMessaging.jsm
@@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = ["NativeApp"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/extensions/PerformanceCounters.jsm b/toolkit/components/extensions/PerformanceCounters.jsm
index af1e8d218f797..17ddccbb33c0e 100644
--- a/toolkit/components/extensions/PerformanceCounters.jsm
+++ b/toolkit/components/extensions/PerformanceCounters.jsm
@@ -21,7 +21,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { DeferredTask } = ChromeUtils.import(
"resource://gre/modules/DeferredTask.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { DefaultMap } = ExtensionUtils;
diff --git a/toolkit/components/extensions/Schemas.jsm b/toolkit/components/extensions/Schemas.jsm
index 36d818be2239f..398fb43dc6576 100644
--- a/toolkit/components/extensions/Schemas.jsm
+++ b/toolkit/components/extensions/Schemas.jsm
@@ -8,7 +8,6 @@
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/extensions/WebNavigation.jsm b/toolkit/components/extensions/WebNavigation.jsm
index f585f29d88b63..4ff28b7331fd2 100644
--- a/toolkit/components/extensions/WebNavigation.jsm
+++ b/toolkit/components/extensions/WebNavigation.jsm
@@ -6,7 +6,6 @@
const EXPORTED_SYMBOLS = ["WebNavigation", "WebNavigationManager"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/extensions/webrequest/WebRequest.jsm b/toolkit/components/extensions/webrequest/WebRequest.jsm
index dbd3cb5ef3fa6..a70deb2d049e2 100644
--- a/toolkit/components/extensions/webrequest/WebRequest.jsm
+++ b/toolkit/components/extensions/webrequest/WebRequest.jsm
@@ -12,7 +12,6 @@ const EXPORTED_SYMBOLS = ["WebRequest"];
const { nsIHttpActivityObserver, nsISocketTransport } = Ci;
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/featuregates/FeatureGateImplementation.jsm b/toolkit/components/featuregates/FeatureGateImplementation.jsm
index ca00749702fdb..6878d3372df29 100644
--- a/toolkit/components/featuregates/FeatureGateImplementation.jsm
+++ b/toolkit/components/featuregates/FeatureGateImplementation.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/toolkit/components/forgetaboutsite/ForgetAboutSite.jsm b/toolkit/components/forgetaboutsite/ForgetAboutSite.jsm
index 29a0a865eb2af..ff625b5b31b4b 100644
--- a/toolkit/components/forgetaboutsite/ForgetAboutSite.jsm
+++ b/toolkit/components/forgetaboutsite/ForgetAboutSite.jsm
@@ -4,8 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var EXPORTED_SYMBOLS = ["ForgetAboutSite"];
var ForgetAboutSite = {
diff --git a/toolkit/components/formautofill/FormAutofill.jsm b/toolkit/components/formautofill/FormAutofill.jsm
index 0dd8099f10c6e..5d219a5e1af5c 100644
--- a/toolkit/components/formautofill/FormAutofill.jsm
+++ b/toolkit/components/formautofill/FormAutofill.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["FormAutofill"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/formautofill/FormAutofillChild.jsm b/toolkit/components/formautofill/FormAutofillChild.jsm
index 5a51f1d3b8904..6e11c6273ee6f 100644
--- a/toolkit/components/formautofill/FormAutofillChild.jsm
+++ b/toolkit/components/formautofill/FormAutofillChild.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["FormAutofillChild"];
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/formautofill/FormAutofillContent.jsm b/toolkit/components/formautofill/FormAutofillContent.jsm
index ac6b312449c16..1755070790aec 100644
--- a/toolkit/components/formautofill/FormAutofillContent.jsm
+++ b/toolkit/components/formautofill/FormAutofillContent.jsm
@@ -14,7 +14,6 @@ var EXPORTED_SYMBOLS = ["FormAutofillContent"];
const Cm = Components.manager;
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/formautofill/FormAutofillHandler.jsm b/toolkit/components/formautofill/FormAutofillHandler.jsm
index 927363285c252..85cee6e31e7ac 100644
--- a/toolkit/components/formautofill/FormAutofillHandler.jsm
+++ b/toolkit/components/formautofill/FormAutofillHandler.jsm
@@ -10,8 +10,6 @@
var EXPORTED_SYMBOLS = ["FormAutofillHandler"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/formautofill/FormAutofillHeuristics.jsm b/toolkit/components/formautofill/FormAutofillHeuristics.jsm
index 5d8581352c22c..b63cbd5ec67bb 100644
--- a/toolkit/components/formautofill/FormAutofillHeuristics.jsm
+++ b/toolkit/components/formautofill/FormAutofillHeuristics.jsm
@@ -11,7 +11,6 @@
const EXPORTED_SYMBOLS = ["FormAutofillHeuristics", "FieldScanner"];
let FormAutofillHeuristics;
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/formautofill/FormAutofillParent.jsm b/toolkit/components/formautofill/FormAutofillParent.jsm
index 5928080f394e7..c7324cd674e45 100644
--- a/toolkit/components/formautofill/FormAutofillParent.jsm
+++ b/toolkit/components/formautofill/FormAutofillParent.jsm
@@ -31,7 +31,6 @@
// constructor via a backstage pass.
var EXPORTED_SYMBOLS = ["FormAutofillParent", "FormAutofillStatus"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/formautofill/FormAutofillPreferences.jsm b/toolkit/components/formautofill/FormAutofillPreferences.jsm
index 373f3cbafcf45..12b57f731145f 100644
--- a/toolkit/components/formautofill/FormAutofillPreferences.jsm
+++ b/toolkit/components/formautofill/FormAutofillPreferences.jsm
@@ -18,7 +18,6 @@ const MANAGE_ADDRESSES_URL =
const MANAGE_CREDITCARDS_URL =
"chrome://formautofill/content/manageCreditCards.xhtml";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { FormAutofill } = ChromeUtils.import(
"resource://autofill/FormAutofill.jsm"
);
diff --git a/toolkit/components/formautofill/FormAutofillStorageBase.jsm b/toolkit/components/formautofill/FormAutofillStorageBase.jsm
index 78d1050d256c0..04f8d6ffcb59f 100644
--- a/toolkit/components/formautofill/FormAutofillStorageBase.jsm
+++ b/toolkit/components/formautofill/FormAutofillStorageBase.jsm
@@ -130,7 +130,6 @@ const EXPORTED_SYMBOLS = [
"AddressesBase",
];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/formautofill/FormAutofillSync.jsm b/toolkit/components/formautofill/FormAutofillSync.jsm
index 893174e133f23..2f2d10c6b7670 100644
--- a/toolkit/components/formautofill/FormAutofillSync.jsm
+++ b/toolkit/components/formautofill/FormAutofillSync.jsm
@@ -12,7 +12,6 @@ var EXPORTED_SYMBOLS = [
"AutofillRecord",
];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { Changeset, Store, SyncEngine, Tracker } = ChromeUtils.import(
"resource://services-sync/engines.js"
);
diff --git a/toolkit/components/formautofill/FormAutofillTelemetryUtils.jsm b/toolkit/components/formautofill/FormAutofillTelemetryUtils.jsm
index 4b568b20b97d0..3f018bbbc5312 100644
--- a/toolkit/components/formautofill/FormAutofillTelemetryUtils.jsm
+++ b/toolkit/components/formautofill/FormAutofillTelemetryUtils.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["CreditCardTelemetry"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { FormAutofillUtils } = ChromeUtils.import(
"resource://autofill/FormAutofillUtils.jsm"
);
diff --git a/toolkit/components/formautofill/FormAutofillUtils.jsm b/toolkit/components/formautofill/FormAutofillUtils.jsm
index 49d7620443e0d..8667da9e2ebaa 100644
--- a/toolkit/components/formautofill/FormAutofillUtils.jsm
+++ b/toolkit/components/formautofill/FormAutofillUtils.jsm
@@ -66,7 +66,6 @@ const MAX_FIELD_VALUE_LENGTH = 200;
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { FormAutofill } = ChromeUtils.import(
"resource://autofill/FormAutofill.jsm"
);
diff --git a/toolkit/components/formautofill/default/FormAutofillPrompter.jsm b/toolkit/components/formautofill/default/FormAutofillPrompter.jsm
index 22dd8da5312ed..d6ff9f8c9c38f 100644
--- a/toolkit/components/formautofill/default/FormAutofillPrompter.jsm
+++ b/toolkit/components/formautofill/default/FormAutofillPrompter.jsm
@@ -14,7 +14,6 @@ var EXPORTED_SYMBOLS = ["FormAutofillPrompter"];
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { FormAutofill } = ChromeUtils.import(
"resource://autofill/FormAutofill.jsm"
);
diff --git a/toolkit/components/gfx/SanityTest.jsm b/toolkit/components/gfx/SanityTest.jsm
index f4cbb2a1ae13e..969c8873be933 100644
--- a/toolkit/components/gfx/SanityTest.jsm
+++ b/toolkit/components/gfx/SanityTest.jsm
@@ -4,8 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const FRAME_SCRIPT_URL = "chrome://gfxsanity/content/gfxFrameScript.js";
const TEST_DISABLED_PREF = "media.sanity-test.disabled";
diff --git a/toolkit/components/messaging-system/lib/Logger.jsm b/toolkit/components/messaging-system/lib/Logger.jsm
index 2afc3aa526ff4..a44b7b7f1e1ab 100644
--- a/toolkit/components/messaging-system/lib/Logger.jsm
+++ b/toolkit/components/messaging-system/lib/Logger.jsm
@@ -5,7 +5,6 @@
const EXPORTED_SYMBOLS = ["Logger"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
const LOGGING_PREF = "messaging-system.log";
diff --git a/toolkit/components/messaging-system/lib/SpecialMessageActions.jsm b/toolkit/components/messaging-system/lib/SpecialMessageActions.jsm
index 68133cd479f0f..8c5212c05c041 100644
--- a/toolkit/components/messaging-system/lib/SpecialMessageActions.jsm
+++ b/toolkit/components/messaging-system/lib/SpecialMessageActions.jsm
@@ -5,7 +5,6 @@
const EXPORTED_SYMBOLS = ["SpecialMessageActions"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/messaging-system/targeting/Targeting.jsm b/toolkit/components/messaging-system/targeting/Targeting.jsm
index 4e3fd8a466265..b7a6ab581c6c5 100644
--- a/toolkit/components/messaging-system/targeting/Targeting.jsm
+++ b/toolkit/components/messaging-system/targeting/Targeting.jsm
@@ -7,7 +7,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/mozintl/mozIntl.jsm b/toolkit/components/mozintl/mozIntl.jsm
index a7a11412f6599..fff62f35e938c 100644
--- a/toolkit/components/mozintl/mozIntl.jsm
+++ b/toolkit/components/mozintl/mozIntl.jsm
@@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const mozIntlHelper = Cc["@mozilla.org/mozintlhelper;1"].getService(
Ci.mozIMozIntlHelper
);
diff --git a/toolkit/components/mozprotocol/MozProtocolHandler.jsm b/toolkit/components/mozprotocol/MozProtocolHandler.jsm
index d6e1eb59cfcea..3716e14bf3f72 100644
--- a/toolkit/components/mozprotocol/MozProtocolHandler.jsm
+++ b/toolkit/components/mozprotocol/MozProtocolHandler.jsm
@@ -6,7 +6,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
function MozProtocolHandler() {
diff --git a/toolkit/components/narrate/NarrateControls.jsm b/toolkit/components/narrate/NarrateControls.jsm
index 235af0fa377b3..57d5b090158f2 100644
--- a/toolkit/components/narrate/NarrateControls.jsm
+++ b/toolkit/components/narrate/NarrateControls.jsm
@@ -10,7 +10,6 @@ const { VoiceSelect } = ChromeUtils.import(
const { Narrator } = ChromeUtils.import(
"resource://gre/modules/narrate/Narrator.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AsyncPrefs } = ChromeUtils.import(
"resource://gre/modules/AsyncPrefs.jsm"
);
diff --git a/toolkit/components/narrate/Narrator.jsm b/toolkit/components/narrate/Narrator.jsm
index 3a7f71022e45d..a73d6d329821b 100644
--- a/toolkit/components/narrate/Narrator.jsm
+++ b/toolkit/components/narrate/Narrator.jsm
@@ -4,8 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var EXPORTED_SYMBOLS = ["Narrator"];
// Maximum time into paragraph when pressing "skip previous" will go
diff --git a/toolkit/components/narrate/test/NarrateTestUtils.jsm b/toolkit/components/narrate/test/NarrateTestUtils.jsm
index 1be38b4a373a1..f954f21126b59 100644
--- a/toolkit/components/narrate/test/NarrateTestUtils.jsm
+++ b/toolkit/components/narrate/test/NarrateTestUtils.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { Preferences } = ChromeUtils.import(
"resource://gre/modules/Preferences.jsm"
);
diff --git a/toolkit/components/nimbus/ExperimentAPI.jsm b/toolkit/components/nimbus/ExperimentAPI.jsm
index 8cf18b6cd6bef..0c6623f95f942 100644
--- a/toolkit/components/nimbus/ExperimentAPI.jsm
+++ b/toolkit/components/nimbus/ExperimentAPI.jsm
@@ -14,7 +14,6 @@ function isBooleanValueDefined(value) {
return typeof value === "boolean";
}
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/nimbus/lib/ExperimentManager.jsm b/toolkit/components/nimbus/lib/ExperimentManager.jsm
index 42388089f7aad..02718c887ff14 100644
--- a/toolkit/components/nimbus/lib/ExperimentManager.jsm
+++ b/toolkit/components/nimbus/lib/ExperimentManager.jsm
@@ -9,7 +9,6 @@ const EXPORTED_SYMBOLS = ["ExperimentManager", "_ExperimentManager"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/nimbus/lib/ExperimentStore.jsm b/toolkit/components/nimbus/lib/ExperimentStore.jsm
index 102c702a99c3a..e273d6132f654 100644
--- a/toolkit/components/nimbus/lib/ExperimentStore.jsm
+++ b/toolkit/components/nimbus/lib/ExperimentStore.jsm
@@ -12,7 +12,6 @@ const { SharedDataMap } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
FeatureManifest: "resource://nimbus/FeatureManifest.js",
diff --git a/toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.jsm b/toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.jsm
index 7ac3f7b09cfb1..4efb6027ab314 100644
--- a/toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.jsm
+++ b/toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.jsm
@@ -9,7 +9,6 @@ const EXPORTED_SYMBOLS = [
"RemoteSettingsExperimentLoader",
];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/nimbus/lib/SharedDataMap.jsm b/toolkit/components/nimbus/lib/SharedDataMap.jsm
index 4a54f10762737..9b5fd3807a2ab 100644
--- a/toolkit/components/nimbus/lib/SharedDataMap.jsm
+++ b/toolkit/components/nimbus/lib/SharedDataMap.jsm
@@ -6,7 +6,6 @@
const EXPORTED_SYMBOLS = ["SharedDataMap"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { EventEmitter } = ChromeUtils.import(
"resource://gre/modules/EventEmitter.jsm"
);
diff --git a/toolkit/components/nimbus/test/NimbusTestUtils.jsm b/toolkit/components/nimbus/test/NimbusTestUtils.jsm
index 454adda7b61c4..9ec3f73a6502e 100644
--- a/toolkit/components/nimbus/test/NimbusTestUtils.jsm
+++ b/toolkit/components/nimbus/test/NimbusTestUtils.jsm
@@ -4,8 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/normandy/Normandy.jsm b/toolkit/components/normandy/Normandy.jsm
index 3e7994ad1ee0c..2ef52e9d328fb 100644
--- a/toolkit/components/normandy/Normandy.jsm
+++ b/toolkit/components/normandy/Normandy.jsm
@@ -4,7 +4,6 @@
"use strict";
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/normandy/NormandyMigrations.jsm b/toolkit/components/normandy/NormandyMigrations.jsm
index 603f187540ece..00f1abac02d4c 100644
--- a/toolkit/components/normandy/NormandyMigrations.jsm
+++ b/toolkit/components/normandy/NormandyMigrations.jsm
@@ -4,7 +4,6 @@
"use strict";
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AddonStudies } = ChromeUtils.import(
"resource://normandy/lib/AddonStudies.jsm"
diff --git a/toolkit/components/normandy/actions/AddonRolloutAction.jsm b/toolkit/components/normandy/actions/AddonRolloutAction.jsm
index 7dbc8e1aa1544..5a293b834719b 100644
--- a/toolkit/components/normandy/actions/AddonRolloutAction.jsm
+++ b/toolkit/components/normandy/actions/AddonRolloutAction.jsm
@@ -10,7 +10,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { BaseAction } = ChromeUtils.import(
"resource://normandy/actions/BaseAction.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/normandy/actions/BaseStudyAction.jsm b/toolkit/components/normandy/actions/BaseStudyAction.jsm
index 778e4a53e60f1..fdc68eed0c00c 100644
--- a/toolkit/components/normandy/actions/BaseStudyAction.jsm
+++ b/toolkit/components/normandy/actions/BaseStudyAction.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { BaseAction } = ChromeUtils.import(
"resource://normandy/actions/BaseAction.jsm"
);
diff --git a/toolkit/components/normandy/actions/BranchedAddonStudyAction.jsm b/toolkit/components/normandy/actions/BranchedAddonStudyAction.jsm
index 2e0e8f8cf4c09..e789b1f2c3290 100644
--- a/toolkit/components/normandy/actions/BranchedAddonStudyAction.jsm
+++ b/toolkit/components/normandy/actions/BranchedAddonStudyAction.jsm
@@ -17,7 +17,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { BaseStudyAction } = ChromeUtils.import(
"resource://normandy/actions/BaseStudyAction.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/normandy/actions/PreferenceRolloutAction.jsm b/toolkit/components/normandy/actions/PreferenceRolloutAction.jsm
index 8d0d3b858c3ec..06c5394af6e71 100644
--- a/toolkit/components/normandy/actions/PreferenceRolloutAction.jsm
+++ b/toolkit/components/normandy/actions/PreferenceRolloutAction.jsm
@@ -7,7 +7,6 @@
const { BaseAction } = ChromeUtils.import(
"resource://normandy/actions/BaseAction.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/toolkit/components/normandy/actions/ShowHeartbeatAction.jsm b/toolkit/components/normandy/actions/ShowHeartbeatAction.jsm
index 2a309d2f63f72..c5114b92ba874 100644
--- a/toolkit/components/normandy/actions/ShowHeartbeatAction.jsm
+++ b/toolkit/components/normandy/actions/ShowHeartbeatAction.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/normandy/content/AboutPages.jsm b/toolkit/components/normandy/content/AboutPages.jsm
index d6c4a1ee739c4..0a1b56e003662 100644
--- a/toolkit/components/normandy/content/AboutPages.jsm
+++ b/toolkit/components/normandy/content/AboutPages.jsm
@@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/normandy/content/ShieldFrameChild.jsm b/toolkit/components/normandy/content/ShieldFrameChild.jsm
index dd26aa7928dcf..f1c53961fecd3 100644
--- a/toolkit/components/normandy/content/ShieldFrameChild.jsm
+++ b/toolkit/components/normandy/content/ShieldFrameChild.jsm
@@ -12,7 +12,6 @@ var EXPORTED_SYMBOLS = ["ShieldFrameChild"];
* to the parent process and handle it there.
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/normandy/lib/AddonStudies.jsm b/toolkit/components/normandy/lib/AddonStudies.jsm
index 37413eaa7e057..782c91c2aaca3 100644
--- a/toolkit/components/normandy/lib/AddonStudies.jsm
+++ b/toolkit/components/normandy/lib/AddonStudies.jsm
@@ -44,7 +44,6 @@
* or any other purpose. May be null on old study.
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { LogManager } = ChromeUtils.import(
"resource://normandy/lib/LogManager.jsm"
);
diff --git a/toolkit/components/normandy/lib/ClientEnvironment.jsm b/toolkit/components/normandy/lib/ClientEnvironment.jsm
index 39bb8477bb46d..eeb50e1d79c95 100644
--- a/toolkit/components/normandy/lib/ClientEnvironment.jsm
+++ b/toolkit/components/normandy/lib/ClientEnvironment.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { ClientEnvironmentBase } = ChromeUtils.import(
"resource://gre/modules/components-utils/ClientEnvironment.jsm"
);
diff --git a/toolkit/components/normandy/lib/Heartbeat.jsm b/toolkit/components/normandy/lib/Heartbeat.jsm
index 6d53163bf71b2..a96898204dd0f 100644
--- a/toolkit/components/normandy/lib/Heartbeat.jsm
+++ b/toolkit/components/normandy/lib/Heartbeat.jsm
@@ -7,7 +7,6 @@
const { Preferences } = ChromeUtils.import(
"resource://gre/modules/Preferences.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { TelemetryController } = ChromeUtils.import(
"resource://gre/modules/TelemetryController.jsm"
);
diff --git a/toolkit/components/normandy/lib/NormandyApi.jsm b/toolkit/components/normandy/lib/NormandyApi.jsm
index 0ea744683acf5..7472d70a45161 100644
--- a/toolkit/components/normandy/lib/NormandyApi.jsm
+++ b/toolkit/components/normandy/lib/NormandyApi.jsm
@@ -4,8 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/components/normandy/lib/NormandyUtils.jsm b/toolkit/components/normandy/lib/NormandyUtils.jsm
index eb2f044429cbf..dbee71606d2ee 100644
--- a/toolkit/components/normandy/lib/NormandyUtils.jsm
+++ b/toolkit/components/normandy/lib/NormandyUtils.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["NormandyUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var NormandyUtils = {
generateUuid() {
// Generate a random UUID, convert it to a string, and slice the braces off the ends.
diff --git a/toolkit/components/normandy/lib/PrefUtils.jsm b/toolkit/components/normandy/lib/PrefUtils.jsm
index 864baf8f32cd0..7e4de9b556327 100644
--- a/toolkit/components/normandy/lib/PrefUtils.jsm
+++ b/toolkit/components/normandy/lib/PrefUtils.jsm
@@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/normandy/lib/PreferenceExperiments.jsm b/toolkit/components/normandy/lib/PreferenceExperiments.jsm
index f8063753c2b21..bb938cbb7613f 100644
--- a/toolkit/components/normandy/lib/PreferenceExperiments.jsm
+++ b/toolkit/components/normandy/lib/PreferenceExperiments.jsm
@@ -81,7 +81,6 @@
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { CleanupManager } = ChromeUtils.import(
"resource://normandy/lib/CleanupManager.jsm"
);
diff --git a/toolkit/components/normandy/lib/PreferenceRollouts.jsm b/toolkit/components/normandy/lib/PreferenceRollouts.jsm
index 5890566ea68ab..2dbce51451f78 100644
--- a/toolkit/components/normandy/lib/PreferenceRollouts.jsm
+++ b/toolkit/components/normandy/lib/PreferenceRollouts.jsm
@@ -7,7 +7,6 @@
const { LogManager } = ChromeUtils.import(
"resource://normandy/lib/LogManager.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/toolkit/components/normandy/lib/RecipeRunner.jsm b/toolkit/components/normandy/lib/RecipeRunner.jsm
index bc07715a9cb5c..7ec4693951f8d 100644
--- a/toolkit/components/normandy/lib/RecipeRunner.jsm
+++ b/toolkit/components/normandy/lib/RecipeRunner.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/normandy/lib/ShieldPreferences.jsm b/toolkit/components/normandy/lib/ShieldPreferences.jsm
index 4c35a4481e0bf..ca680ebe0d458 100644
--- a/toolkit/components/normandy/lib/ShieldPreferences.jsm
+++ b/toolkit/components/normandy/lib/ShieldPreferences.jsm
@@ -6,7 +6,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/normandy/lib/TelemetryEvents.jsm b/toolkit/components/normandy/lib/TelemetryEvents.jsm
index 5b13bdf0c3c60..aa57eb504ff4d 100644
--- a/toolkit/components/normandy/lib/TelemetryEvents.jsm
+++ b/toolkit/components/normandy/lib/TelemetryEvents.jsm
@@ -3,8 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var EXPORTED_SYMBOLS = ["TelemetryEvents"];
const TELEMETRY_CATEGORY = "normandy";
diff --git a/toolkit/components/normandy/lib/Uptake.jsm b/toolkit/components/normandy/lib/Uptake.jsm
index 5ba5669b77308..6e38dab5caee4 100644
--- a/toolkit/components/normandy/lib/Uptake.jsm
+++ b/toolkit/components/normandy/lib/Uptake.jsm
@@ -7,7 +7,6 @@
const { UptakeTelemetry } = ChromeUtils.import(
"resource://services-common/uptake-telemetry.js"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var EXPORTED_SYMBOLS = ["Uptake"];
diff --git a/toolkit/components/normandy/test/NormandyTestUtils.jsm b/toolkit/components/normandy/test/NormandyTestUtils.jsm
index dc20759d606e5..037bd97604b47 100644
--- a/toolkit/components/normandy/test/NormandyTestUtils.jsm
+++ b/toolkit/components/normandy/test/NormandyTestUtils.jsm
@@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { Preferences } = ChromeUtils.import(
"resource://gre/modules/Preferences.jsm"
);
diff --git a/toolkit/components/osfile/modules/osfile_async_front.jsm b/toolkit/components/osfile/modules/osfile_async_front.jsm
index 69b789cef2b1f..f3470188c2535 100644
--- a/toolkit/components/osfile/modules/osfile_async_front.jsm
+++ b/toolkit/components/osfile/modules/osfile_async_front.jsm
@@ -64,7 +64,6 @@ ChromeUtils.defineModuleGetter(
const { BasePromiseWorker } = ChromeUtils.import(
"resource://gre/modules/PromiseWorker.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AsyncShutdown } = ChromeUtils.import(
"resource://gre/modules/AsyncShutdown.jsm"
);
diff --git a/toolkit/components/osfile/modules/osfile_shared_allthreads.jsm b/toolkit/components/osfile/modules/osfile_shared_allthreads.jsm
index 527c10ca0b763..d3b952beebe80 100644
--- a/toolkit/components/osfile/modules/osfile_shared_allthreads.jsm
+++ b/toolkit/components/osfile/modules/osfile_shared_allthreads.jsm
@@ -30,17 +30,12 @@
* @constructor
*/
var Meta;
-let Services;
if (typeof Components != "undefined") {
// Global definition of |exports|, to keep everybody happy.
// In non-main thread, |exports| is provided by the module
// loader.
// eslint-disable-next-line mozilla/reject-global-this
this.exports = {};
- // eslint-disable-next-line no-global-assign
- ({ Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"));
- // eslint-disable-next-line mozilla/reject-global-this
- this.Services = Services;
Meta = ChromeUtils.import("resource://gre/modules/PromiseWorker.jsm")
.BasePromiseWorker.Meta;
} else {
diff --git a/toolkit/components/passwordmgr/InsecurePasswordUtils.jsm b/toolkit/components/passwordmgr/InsecurePasswordUtils.jsm
index 1036f8caea713..3c5438ba273d9 100644
--- a/toolkit/components/passwordmgr/InsecurePasswordUtils.jsm
+++ b/toolkit/components/passwordmgr/InsecurePasswordUtils.jsm
@@ -9,7 +9,6 @@ const EXPORTED_SYMBOLS = ["InsecurePasswordUtils"];
const STRINGS_URI = "chrome://global/locale/security/security.properties";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/passwordmgr/LoginAutoComplete.jsm b/toolkit/components/passwordmgr/LoginAutoComplete.jsm
index c84c57ce0238d..373f17f40f67c 100644
--- a/toolkit/components/passwordmgr/LoginAutoComplete.jsm
+++ b/toolkit/components/passwordmgr/LoginAutoComplete.jsm
@@ -13,7 +13,6 @@ const EXPORTED_SYMBOLS = ["LoginAutoComplete", "LoginAutoCompleteResult"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/passwordmgr/LoginCSVImport.jsm b/toolkit/components/passwordmgr/LoginCSVImport.jsm
index aa7ade0189ee7..e6f33ca07b205 100644
--- a/toolkit/components/passwordmgr/LoginCSVImport.jsm
+++ b/toolkit/components/passwordmgr/LoginCSVImport.jsm
@@ -17,7 +17,6 @@ const EXPORTED_SYMBOLS = [
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/passwordmgr/LoginExport.jsm b/toolkit/components/passwordmgr/LoginExport.jsm
index 57d4811a16474..42dc131f5ddb0 100644
--- a/toolkit/components/passwordmgr/LoginExport.jsm
+++ b/toolkit/components/passwordmgr/LoginExport.jsm
@@ -13,7 +13,6 @@ const EXPORTED_SYMBOLS = ["LoginExport"];
let { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/passwordmgr/LoginHelper.jsm b/toolkit/components/passwordmgr/LoginHelper.jsm
index 5f06747b18723..0af97785284b8 100644
--- a/toolkit/components/passwordmgr/LoginHelper.jsm
+++ b/toolkit/components/passwordmgr/LoginHelper.jsm
@@ -14,7 +14,6 @@
const EXPORTED_SYMBOLS = ["LoginHelper"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/passwordmgr/LoginInfo.jsm b/toolkit/components/passwordmgr/LoginInfo.jsm
index ab391ac66c24d..9616a8d875912 100644
--- a/toolkit/components/passwordmgr/LoginInfo.jsm
+++ b/toolkit/components/passwordmgr/LoginInfo.jsm
@@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/components/passwordmgr/LoginManager.jsm b/toolkit/components/passwordmgr/LoginManager.jsm
index e9b3a598dac2b..b48519efa9cba 100644
--- a/toolkit/components/passwordmgr/LoginManager.jsm
+++ b/toolkit/components/passwordmgr/LoginManager.jsm
@@ -10,7 +10,6 @@ const MAX_DATE_MS = 8640000000000000;
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/passwordmgr/LoginManagerAuthPrompter.jsm b/toolkit/components/passwordmgr/LoginManagerAuthPrompter.jsm
index d9e7b7319b109..c822f0e80074f 100644
--- a/toolkit/components/passwordmgr/LoginManagerAuthPrompter.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerAuthPrompter.jsm
@@ -5,7 +5,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { PrivateBrowsingUtils } = ChromeUtils.import(
"resource://gre/modules/PrivateBrowsingUtils.jsm"
);
diff --git a/toolkit/components/passwordmgr/LoginManagerChild.jsm b/toolkit/components/passwordmgr/LoginManagerChild.jsm
index 7caebe22f563b..5163c14438fe5 100644
--- a/toolkit/components/passwordmgr/LoginManagerChild.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerChild.jsm
@@ -30,7 +30,6 @@ const LOG_MESSAGE_FIELD_EDIT = "field edit";
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/passwordmgr/LoginManagerContextMenu.jsm b/toolkit/components/passwordmgr/LoginManagerContextMenu.jsm
index 790be36bedfe0..3bc38edd9a116 100644
--- a/toolkit/components/passwordmgr/LoginManagerContextMenu.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerContextMenu.jsm
@@ -9,7 +9,6 @@ const EXPORTED_SYMBOLS = ["LoginManagerContextMenu"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/passwordmgr/LoginManagerParent.jsm b/toolkit/components/passwordmgr/LoginManagerParent.jsm
index 937165ee4807f..a34fe72a3b433 100644
--- a/toolkit/components/passwordmgr/LoginManagerParent.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerParent.jsm
@@ -7,7 +7,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const LoginInfo = new Components.Constructor(
"@mozilla.org/login-manager/loginInfo;1",
diff --git a/toolkit/components/passwordmgr/LoginManagerPrompter.jsm b/toolkit/components/passwordmgr/LoginManagerPrompter.jsm
index d81acbb365787..9975b56fcc4c1 100644
--- a/toolkit/components/passwordmgr/LoginManagerPrompter.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerPrompter.jsm
@@ -5,7 +5,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { PrivateBrowsingUtils } = ChromeUtils.import(
"resource://gre/modules/PrivateBrowsingUtils.jsm"
);
diff --git a/toolkit/components/passwordmgr/LoginRecipes.jsm b/toolkit/components/passwordmgr/LoginRecipes.jsm
index 304aef3b7c27f..37fdc64c8cbd5 100644
--- a/toolkit/components/passwordmgr/LoginRecipes.jsm
+++ b/toolkit/components/passwordmgr/LoginRecipes.jsm
@@ -20,7 +20,6 @@ const OPTIONAL_KEYS = [
];
const SUPPORTED_KEYS = REQUIRED_KEYS.concat(OPTIONAL_KEYS);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/passwordmgr/LoginRelatedRealms.jsm b/toolkit/components/passwordmgr/LoginRelatedRealms.jsm
index f1c6b3a3aa2a4..ddffded7ea61e 100644
--- a/toolkit/components/passwordmgr/LoginRelatedRealms.jsm
+++ b/toolkit/components/passwordmgr/LoginRelatedRealms.jsm
@@ -7,7 +7,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/passwordmgr/LoginStore.jsm b/toolkit/components/passwordmgr/LoginStore.jsm
index e21d366009193..0f0849e6a43dc 100644
--- a/toolkit/components/passwordmgr/LoginStore.jsm
+++ b/toolkit/components/passwordmgr/LoginStore.jsm
@@ -42,7 +42,6 @@ const EXPORTED_SYMBOLS = ["LoginStore"];
// Globals
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { JSONFile } = ChromeUtils.import("resource://gre/modules/JSONFile.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
diff --git a/toolkit/components/passwordmgr/PasswordRulesManager.jsm b/toolkit/components/passwordmgr/PasswordRulesManager.jsm
index 0ab40e36287c0..2eaeea2b868eb 100644
--- a/toolkit/components/passwordmgr/PasswordRulesManager.jsm
+++ b/toolkit/components/passwordmgr/PasswordRulesManager.jsm
@@ -7,7 +7,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/passwordmgr/test/LoginTestUtils.jsm b/toolkit/components/passwordmgr/test/LoginTestUtils.jsm
index 06abd0386b376..ea3ce271b1272 100644
--- a/toolkit/components/passwordmgr/test/LoginTestUtils.jsm
+++ b/toolkit/components/passwordmgr/test/LoginTestUtils.jsm
@@ -19,8 +19,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.js",
});
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
let { Assert: AssertCls } = ChromeUtils.import(
"resource://testing-common/Assert.jsm"
);
diff --git a/toolkit/components/pdfjs/content/PdfJs.jsm b/toolkit/components/pdfjs/content/PdfJs.jsm
index 3133c29c667b3..25b615fafca27 100644
--- a/toolkit/components/pdfjs/content/PdfJs.jsm
+++ b/toolkit/components/pdfjs/content/PdfJs.jsm
@@ -30,7 +30,6 @@ const PDF_CONTENT_TYPE = "application/pdf";
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var Svc = {};
XPCOMUtils.defineLazyServiceGetter(
diff --git a/toolkit/components/pdfjs/content/PdfJsNetwork.jsm b/toolkit/components/pdfjs/content/PdfJsNetwork.jsm
index 2f0906fe75833..c047774302dc2 100644
--- a/toolkit/components/pdfjs/content/PdfJsNetwork.jsm
+++ b/toolkit/components/pdfjs/content/PdfJsNetwork.jsm
@@ -15,8 +15,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var EXPORTED_SYMBOLS = ["NetworkManager"];
// eslint-disable-next-line no-unused-vars
diff --git a/toolkit/components/pdfjs/content/PdfJsTelemetry.jsm b/toolkit/components/pdfjs/content/PdfJsTelemetry.jsm
index 323db881459fd..451d1f587c2ed 100644
--- a/toolkit/components/pdfjs/content/PdfJsTelemetry.jsm
+++ b/toolkit/components/pdfjs/content/PdfJsTelemetry.jsm
@@ -18,8 +18,6 @@
var EXPORTED_SYMBOLS = ["PdfJsTelemetry"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var PdfJsTelemetry = {
onViewerIsUsed(isAttachment) {
Services.telemetry.scalarAdd("pdf.viewer.used", 1);
diff --git a/toolkit/components/pdfjs/content/PdfSandbox.jsm b/toolkit/components/pdfjs/content/PdfSandbox.jsm
index 7ee2faf9f3da3..6e591e742e91b 100644
--- a/toolkit/components/pdfjs/content/PdfSandbox.jsm
+++ b/toolkit/components/pdfjs/content/PdfSandbox.jsm
@@ -15,7 +15,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { SandboxSupportBase } = ChromeUtils.import(
"resource://pdf.js/build/pdf.sandbox.external.js"
);
diff --git a/toolkit/components/pdfjs/content/PdfStreamConverter.jsm b/toolkit/components/pdfjs/content/PdfStreamConverter.jsm
index 311cbebbe951a..d27de16cb12cb 100644
--- a/toolkit/components/pdfjs/content/PdfStreamConverter.jsm
+++ b/toolkit/components/pdfjs/content/PdfStreamConverter.jsm
@@ -28,7 +28,6 @@ const PDF_CONTENT_TYPE = "application/pdf";
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/pdfjs/content/PdfjsParent.jsm b/toolkit/components/pdfjs/content/PdfjsParent.jsm
index face48379b32e..728f12dc0ce1e 100644
--- a/toolkit/components/pdfjs/content/PdfjsParent.jsm
+++ b/toolkit/components/pdfjs/content/PdfjsParent.jsm
@@ -21,8 +21,6 @@ const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/components/pictureinpicture/PictureInPicture.jsm b/toolkit/components/pictureinpicture/PictureInPicture.jsm
index b72aa7cde1620..88ce2c46e9eb7 100644
--- a/toolkit/components/pictureinpicture/PictureInPicture.jsm
+++ b/toolkit/components/pictureinpicture/PictureInPicture.jsm
@@ -11,7 +11,6 @@ var EXPORTED_SYMBOLS = [
"PictureInPictureLauncherParent",
];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/places/BookmarkHTMLUtils.jsm b/toolkit/components/places/BookmarkHTMLUtils.jsm
index 60e2cbae31dee..a3bc7a46d2c4b 100644
--- a/toolkit/components/places/BookmarkHTMLUtils.jsm
+++ b/toolkit/components/places/BookmarkHTMLUtils.jsm
@@ -58,7 +58,6 @@
var EXPORTED_SYMBOLS = ["BookmarkHTMLUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
const { FileUtils } = ChromeUtils.import(
"resource://gre/modules/FileUtils.jsm"
diff --git a/toolkit/components/places/BookmarkJSONUtils.jsm b/toolkit/components/places/BookmarkJSONUtils.jsm
index dd18a4074c465..c8ac3336e134e 100644
--- a/toolkit/components/places/BookmarkJSONUtils.jsm
+++ b/toolkit/components/places/BookmarkJSONUtils.jsm
@@ -4,7 +4,6 @@
var EXPORTED_SYMBOLS = ["BookmarkJSONUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { PlacesUtils } = ChromeUtils.import(
"resource://gre/modules/PlacesUtils.jsm"
);
diff --git a/toolkit/components/places/History.jsm b/toolkit/components/places/History.jsm
index e6e4dc7d248df..7c3f99e07b27d 100644
--- a/toolkit/components/places/History.jsm
+++ b/toolkit/components/places/History.jsm
@@ -73,7 +73,6 @@ var EXPORTED_SYMBOLS = ["History"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/places/PlacesBackups.jsm b/toolkit/components/places/PlacesBackups.jsm
index a3926678d286d..144fbe1725599 100644
--- a/toolkit/components/places/PlacesBackups.jsm
+++ b/toolkit/components/places/PlacesBackups.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["PlacesBackups"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/places/PlacesDBUtils.jsm b/toolkit/components/places/PlacesDBUtils.jsm
index 82f635b8b706c..bd03f0a547cd5 100644
--- a/toolkit/components/places/PlacesDBUtils.jsm
+++ b/toolkit/components/places/PlacesDBUtils.jsm
@@ -13,7 +13,6 @@ const CORRUPT_DB_RETAIN_DAYS = 14;
// Seconds between maintenance runs.
const MAINTENANCE_INTERVAL_SECONDS = 7 * 86400;
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/places/PlacesExpiration.jsm b/toolkit/components/places/PlacesExpiration.jsm
index 87e1532931f4c..3e51013dc68d1 100644
--- a/toolkit/components/places/PlacesExpiration.jsm
+++ b/toolkit/components/places/PlacesExpiration.jsm
@@ -21,7 +21,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/places/PlacesPreviews.jsm b/toolkit/components/places/PlacesPreviews.jsm
index 64cf3057b7d10..c35dfc1769766 100644
--- a/toolkit/components/places/PlacesPreviews.jsm
+++ b/toolkit/components/places/PlacesPreviews.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["PlacesPreviews", "PlacesPreviewsHelperService"];
const { EventEmitter } = ChromeUtils.import(
"resource://gre/modules/EventEmitter.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/places/PlacesSyncUtils.jsm b/toolkit/components/places/PlacesSyncUtils.jsm
index 9d2ccf9fcc602..1f2b4a4898846 100644
--- a/toolkit/components/places/PlacesSyncUtils.jsm
+++ b/toolkit/components/places/PlacesSyncUtils.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["PlacesSyncUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/places/PlacesTransactions.jsm b/toolkit/components/places/PlacesTransactions.jsm
index 7f47f22ed80ec..722fb8357688b 100644
--- a/toolkit/components/places/PlacesTransactions.jsm
+++ b/toolkit/components/places/PlacesTransactions.jsm
@@ -169,7 +169,6 @@ const TRANSACTIONS_QUEUE_TIMEOUT_MS = 240000; // 4 Mins.
const { PlacesUtils } = ChromeUtils.import(
"resource://gre/modules/PlacesUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/places/PlacesUtils.jsm b/toolkit/components/places/PlacesUtils.jsm
index b81e568a66040..f814a756b6921 100644
--- a/toolkit/components/places/PlacesUtils.jsm
+++ b/toolkit/components/places/PlacesUtils.jsm
@@ -11,7 +11,6 @@ const { AppConstants } = ChromeUtils.import(
const { PromiseUtils } = ChromeUtils.import(
"resource://gre/modules/PromiseUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/places/TaggingService.jsm b/toolkit/components/places/TaggingService.jsm
index 46408212549fb..631ae947cc27e 100644
--- a/toolkit/components/places/TaggingService.jsm
+++ b/toolkit/components/places/TaggingService.jsm
@@ -3,7 +3,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { PlacesUtils } = ChromeUtils.import(
"resource://gre/modules/PlacesUtils.jsm"
);
diff --git a/toolkit/components/places/tests/PlacesTestUtils.jsm b/toolkit/components/places/tests/PlacesTestUtils.jsm
index 5849dc51ae1b1..3144b7b124e43 100644
--- a/toolkit/components/places/tests/PlacesTestUtils.jsm
+++ b/toolkit/components/places/tests/PlacesTestUtils.jsm
@@ -2,7 +2,6 @@
var EXPORTED_SYMBOLS = ["PlacesTestUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/toolkit/components/processsingleton/CustomElementsListener.jsm b/toolkit/components/processsingleton/CustomElementsListener.jsm
index 551615162c7ae..aa557263c72f8 100644
--- a/toolkit/components/processsingleton/CustomElementsListener.jsm
+++ b/toolkit/components/processsingleton/CustomElementsListener.jsm
@@ -5,8 +5,6 @@
var EXPORTED_SYMBOLS = [];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
// Set up Custom Elements for XUL and XHTML documents before anything else
// happens. Anything loaded here should be considered part of core XUL functionality.
// Any window-specific elements can be registered via <script> tags at the
diff --git a/toolkit/components/processsingleton/MainProcessSingleton.jsm b/toolkit/components/processsingleton/MainProcessSingleton.jsm
index 4f800b93fbce4..51e1416f38d99 100644
--- a/toolkit/components/processsingleton/MainProcessSingleton.jsm
+++ b/toolkit/components/processsingleton/MainProcessSingleton.jsm
@@ -4,8 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
function MainProcessSingleton() {}
MainProcessSingleton.prototype = {
classID: Components.ID("{0636a680-45cb-11e4-916c-0800200c9a66}"),
diff --git a/toolkit/components/prompts/content/tabprompts.jsm b/toolkit/components/prompts/content/tabprompts.jsm
index ca526e8e5823f..c19b7548cf531 100644
--- a/toolkit/components/prompts/content/tabprompts.jsm
+++ b/toolkit/components/prompts/content/tabprompts.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["TabModalPrompt"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/prompts/src/CommonDialog.jsm b/toolkit/components/prompts/src/CommonDialog.jsm
index 41469aeadf75d..e75567e021af7 100644
--- a/toolkit/components/prompts/src/CommonDialog.jsm
+++ b/toolkit/components/prompts/src/CommonDialog.jsm
@@ -4,7 +4,6 @@
var EXPORTED_SYMBOLS = ["CommonDialog"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/toolkit/components/prompts/src/Prompter.jsm b/toolkit/components/prompts/src/Prompter.jsm
index 4a3b74321ecaf..51ead1102fab1 100644
--- a/toolkit/components/prompts/src/Prompter.jsm
+++ b/toolkit/components/prompts/src/Prompter.jsm
@@ -7,7 +7,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
// This is redefined below, for strange and unfortunate reasons.
var { PromptUtils } = ChromeUtils.import(
"resource://gre/modules/SharedPromptUtils.jsm"
diff --git a/toolkit/components/prompts/src/SharedPromptUtils.jsm b/toolkit/components/prompts/src/SharedPromptUtils.jsm
index 698574e567967..805ffca5e114f 100644
--- a/toolkit/components/prompts/src/SharedPromptUtils.jsm
+++ b/toolkit/components/prompts/src/SharedPromptUtils.jsm
@@ -4,8 +4,6 @@
var EXPORTED_SYMBOLS = ["PromptUtils", "EnableDelayHelper"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var PromptUtils = {
// Fire a dialog open/close event. Used by tabbrowser to focus the
// tab which is triggering a prompt.
diff --git a/toolkit/components/prompts/test/PromptTestUtils.jsm b/toolkit/components/prompts/test/PromptTestUtils.jsm
index 51041a609a00d..6ddba782baf2b 100644
--- a/toolkit/components/prompts/test/PromptTestUtils.jsm
+++ b/toolkit/components/prompts/test/PromptTestUtils.jsm
@@ -8,7 +8,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/reader/AboutReader.jsm b/toolkit/components/reader/AboutReader.jsm
index 0fa671d64f296..d82217037deb5 100644
--- a/toolkit/components/reader/AboutReader.jsm
+++ b/toolkit/components/reader/AboutReader.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["AboutReader"];
const { ReaderMode } = ChromeUtils.import(
"resource://gre/modules/ReaderMode.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/reader/ReaderMode.jsm b/toolkit/components/reader/ReaderMode.jsm
index d512d79aae436..a6a69cd019906 100644
--- a/toolkit/components/reader/ReaderMode.jsm
+++ b/toolkit/components/reader/ReaderMode.jsm
@@ -31,7 +31,6 @@ const CLASSES_TO_PRESERVE = [
"wp-smiley",
];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm b/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm
index ed0e0cbebdeb3..ecc21ca1dfcd1 100644
--- a/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm
+++ b/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm
@@ -3,7 +3,6 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/toolkit/components/remotepagemanager/RemotePageManagerChild.jsm b/toolkit/components/remotepagemanager/RemotePageManagerChild.jsm
index ea798a4b6301f..afe4f813ec887 100644
--- a/toolkit/components/remotepagemanager/RemotePageManagerChild.jsm
+++ b/toolkit/components/remotepagemanager/RemotePageManagerChild.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["ChildMessagePort"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { MessagePort } = ChromeUtils.import(
"resource://gre/modules/remotepagemanager/MessagePort.jsm"
);
diff --git a/toolkit/components/remotepagemanager/RemotePageManagerParent.jsm b/toolkit/components/remotepagemanager/RemotePageManagerParent.jsm
index 4d19483c7eba7..0dcedb8fb3bc5 100644
--- a/toolkit/components/remotepagemanager/RemotePageManagerParent.jsm
+++ b/toolkit/components/remotepagemanager/RemotePageManagerParent.jsm
@@ -19,7 +19,6 @@ var EXPORTED_SYMBOLS = ["RemotePages", "RemotePageManager"];
* from MessagePort.jsm.
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { MessageListener, MessagePort } = ChromeUtils.import(
"resource://gre/modules/remotepagemanager/MessagePort.jsm"
);
diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm b/toolkit/components/resistfingerprinting/RFPHelper.jsm
index d2191ee14aa52..ea7a5d6fca7c4 100644
--- a/toolkit/components/resistfingerprinting/RFPHelper.jsm
+++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["RFPHelper"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/satchel/FormAutoComplete.jsm b/toolkit/components/satchel/FormAutoComplete.jsm
index 8129b606df358..8c5e7f22609d1 100644
--- a/toolkit/components/satchel/FormAutoComplete.jsm
+++ b/toolkit/components/satchel/FormAutoComplete.jsm
@@ -5,8 +5,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
function isAutocompleteDisabled(aField) {
if (aField.autocomplete !== "") {
return aField.autocomplete === "off";
diff --git a/toolkit/components/satchel/FormHistory.jsm b/toolkit/components/satchel/FormHistory.jsm
index 34eed62b8051d..e7fffd76a6a66 100644
--- a/toolkit/components/satchel/FormHistory.jsm
+++ b/toolkit/components/satchel/FormHistory.jsm
@@ -88,7 +88,6 @@
const EXPORTED_SYMBOLS = ["FormHistory"];
let FormHistory;
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/satchel/FormHistoryChild.jsm b/toolkit/components/satchel/FormHistoryChild.jsm
index 43bc77633cd17..866b2d7b77bd2 100644
--- a/toolkit/components/satchel/FormHistoryChild.jsm
+++ b/toolkit/components/satchel/FormHistoryChild.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["FormHistoryChild"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/satchel/FormHistoryStartup.jsm b/toolkit/components/satchel/FormHistoryStartup.jsm
index f5c50bc9926cf..8c87a6b3628fa 100644
--- a/toolkit/components/satchel/FormHistoryStartup.jsm
+++ b/toolkit/components/satchel/FormHistoryStartup.jsm
@@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/components/search/OpenSearchEngine.jsm b/toolkit/components/search/OpenSearchEngine.jsm
index 3e7feeb036c57..e15a0adf62637 100644
--- a/toolkit/components/search/OpenSearchEngine.jsm
+++ b/toolkit/components/search/OpenSearchEngine.jsm
@@ -7,7 +7,6 @@
const { EngineURL, SearchEngine } = ChromeUtils.import(
"resource://gre/modules/SearchEngine.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/search/SearchEngine.jsm b/toolkit/components/search/SearchEngine.jsm
index b5672720b1a06..3277c3df93e38 100644
--- a/toolkit/components/search/SearchEngine.jsm
+++ b/toolkit/components/search/SearchEngine.jsm
@@ -7,7 +7,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/search/SearchEngineSelector.jsm b/toolkit/components/search/SearchEngineSelector.jsm
index 5a409a2391812..63dd881d47ae0 100644
--- a/toolkit/components/search/SearchEngineSelector.jsm
+++ b/toolkit/components/search/SearchEngineSelector.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["SearchEngineSelector"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/search/SearchService.jsm b/toolkit/components/search/SearchService.jsm
index 71cc575f009ac..dd5c0525787f7 100644
--- a/toolkit/components/search/SearchService.jsm
+++ b/toolkit/components/search/SearchService.jsm
@@ -10,7 +10,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { PromiseUtils } = ChromeUtils.import(
"resource://gre/modules/PromiseUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/search/SearchSettings.jsm b/toolkit/components/search/SearchSettings.jsm
index 9bbaceb830746..7639b707ec078 100644
--- a/toolkit/components/search/SearchSettings.jsm
+++ b/toolkit/components/search/SearchSettings.jsm
@@ -7,7 +7,6 @@ var EXPORTED_SYMBOLS = ["SearchSettings"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/search/SearchSuggestionController.jsm b/toolkit/components/search/SearchSuggestionController.jsm
index 5dd2ad417fe47..f566712ac75ce 100644
--- a/toolkit/components/search/SearchSuggestionController.jsm
+++ b/toolkit/components/search/SearchSuggestionController.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["SearchSuggestionController"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
diff --git a/toolkit/components/search/SearchSuggestions.jsm b/toolkit/components/search/SearchSuggestions.jsm
index 300446920fd08..47c56c77da9d9 100644
--- a/toolkit/components/search/SearchSuggestions.jsm
+++ b/toolkit/components/search/SearchSuggestions.jsm
@@ -5,7 +5,6 @@
const { FormAutoCompleteResult } = ChromeUtils.import(
"resource://gre/modules/nsFormAutoCompleteResult.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm
index a3100fac89ad5..fb3d27165ad67 100644
--- a/toolkit/components/search/SearchUtils.jsm
+++ b/toolkit/components/search/SearchUtils.jsm
@@ -11,7 +11,6 @@ var EXPORTED_SYMBOLS = ["SearchUtils"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/search/tests/SearchTestUtils.jsm b/toolkit/components/search/tests/SearchTestUtils.jsm
index 693a8d4a1c564..1d47aae6d6466 100644
--- a/toolkit/components/search/tests/SearchTestUtils.jsm
+++ b/toolkit/components/search/tests/SearchTestUtils.jsm
@@ -7,7 +7,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { MockRegistrar } = ChromeUtils.import(
"resource://testing-common/MockRegistrar.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/taskscheduler/TaskSchedulerMacOSImpl.jsm b/toolkit/components/taskscheduler/TaskSchedulerMacOSImpl.jsm
index 215bcd8cd4e78..0d00c1c299054 100644
--- a/toolkit/components/taskscheduler/TaskSchedulerMacOSImpl.jsm
+++ b/toolkit/components/taskscheduler/TaskSchedulerMacOSImpl.jsm
@@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = ["MacOSImpl"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/taskscheduler/TaskSchedulerWinImpl.jsm b/toolkit/components/taskscheduler/TaskSchedulerWinImpl.jsm
index 33a6cd495707d..0cc6f9f1427c6 100644
--- a/toolkit/components/taskscheduler/TaskSchedulerWinImpl.jsm
+++ b/toolkit/components/taskscheduler/TaskSchedulerWinImpl.jsm
@@ -14,7 +14,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/telemetry/app/ClientID.jsm b/toolkit/components/telemetry/app/ClientID.jsm
index f7f0da46cb236..469dfe0a4d764 100644
--- a/toolkit/components/telemetry/app/ClientID.jsm
+++ b/toolkit/components/telemetry/app/ClientID.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["ClientID"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
diff --git a/toolkit/components/telemetry/app/TelemetryControllerBase.jsm b/toolkit/components/telemetry/app/TelemetryControllerBase.jsm
index d7642e7328d3e..62e549e67704f 100644
--- a/toolkit/components/telemetry/app/TelemetryControllerBase.jsm
+++ b/toolkit/components/telemetry/app/TelemetryControllerBase.jsm
@@ -11,7 +11,6 @@ const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const LOGGER_NAME = "Toolkit.Telemetry";
const LOGGER_PREFIX = "TelemetryController::";
diff --git a/toolkit/components/telemetry/app/TelemetryControllerContent.jsm b/toolkit/components/telemetry/app/TelemetryControllerContent.jsm
index 9460d3595b451..b634c82437cfa 100644
--- a/toolkit/components/telemetry/app/TelemetryControllerContent.jsm
+++ b/toolkit/components/telemetry/app/TelemetryControllerContent.jsm
@@ -8,7 +8,6 @@
const { DeferredTask } = ChromeUtils.import(
"resource://gre/modules/DeferredTask.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { TelemetryControllerBase } = ChromeUtils.import(
"resource://gre/modules/TelemetryControllerBase.jsm"
);
diff --git a/toolkit/components/telemetry/app/TelemetryControllerParent.jsm b/toolkit/components/telemetry/app/TelemetryControllerParent.jsm
index 3b10139d8c025..95c0989dfc5c0 100644
--- a/toolkit/components/telemetry/app/TelemetryControllerParent.jsm
+++ b/toolkit/components/telemetry/app/TelemetryControllerParent.jsm
@@ -17,7 +17,6 @@ const { PromiseUtils } = ChromeUtils.import(
const { DeferredTask } = ChromeUtils.import(
"resource://gre/modules/DeferredTask.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { TelemetryUtils } = ChromeUtils.import(
"resource://gre/modules/TelemetryUtils.jsm"
);
diff --git a/toolkit/components/telemetry/app/TelemetryEnvironment.jsm b/toolkit/components/telemetry/app/TelemetryEnvironment.jsm
index e43414866611a..3c215f7c046c5 100644
--- a/toolkit/components/telemetry/app/TelemetryEnvironment.jsm
+++ b/toolkit/components/telemetry/app/TelemetryEnvironment.jsm
@@ -7,7 +7,6 @@
var EXPORTED_SYMBOLS = ["TelemetryEnvironment", "Policy"];
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { TelemetryUtils } = ChromeUtils.import(
"resource://gre/modules/TelemetryUtils.jsm"
);
diff --git a/toolkit/components/telemetry/app/TelemetryReportingPolicy.jsm b/toolkit/components/telemetry/app/TelemetryReportingPolicy.jsm
index a1178714ea683..13e4e4190ea05 100644
--- a/toolkit/components/telemetry/app/TelemetryReportingPolicy.jsm
+++ b/toolkit/components/telemetry/app/TelemetryReportingPolicy.jsm
@@ -7,7 +7,6 @@
var EXPORTED_SYMBOLS = ["TelemetryReportingPolicy", "Policy"];
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { clearTimeout, setTimeout } = ChromeUtils.import(
"resource://gre/modules/Timer.jsm"
);
diff --git a/toolkit/components/telemetry/app/TelemetryScheduler.jsm b/toolkit/components/telemetry/app/TelemetryScheduler.jsm
index d1d6bd5d0d344..7bce8a6df41e8 100644
--- a/toolkit/components/telemetry/app/TelemetryScheduler.jsm
+++ b/toolkit/components/telemetry/app/TelemetryScheduler.jsm
@@ -7,7 +7,6 @@
var EXPORTED_SYMBOLS = ["TelemetryScheduler", "Policy"];
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { TelemetrySession } = ChromeUtils.import(
"resource://gre/modules/TelemetrySession.jsm"
);
diff --git a/toolkit/components/telemetry/app/TelemetrySend.jsm b/toolkit/components/telemetry/app/TelemetrySend.jsm
index 13f6c7be02096..c913bca0f991b 100644
--- a/toolkit/components/telemetry/app/TelemetrySend.jsm
+++ b/toolkit/components/telemetry/app/TelemetrySend.jsm
@@ -32,7 +32,6 @@ const { PromiseUtils } = ChromeUtils.import(
const { ServiceRequest } = ChromeUtils.import(
"resource://gre/modules/ServiceRequest.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { TelemetryUtils } = ChromeUtils.import(
"resource://gre/modules/TelemetryUtils.jsm"
);
diff --git a/toolkit/components/telemetry/app/TelemetryStorage.jsm b/toolkit/components/telemetry/app/TelemetryStorage.jsm
index d8f8eb09aad3a..94c24d2c22372 100644
--- a/toolkit/components/telemetry/app/TelemetryStorage.jsm
+++ b/toolkit/components/telemetry/app/TelemetryStorage.jsm
@@ -11,7 +11,6 @@ const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/telemetry/app/TelemetryUtils.jsm b/toolkit/components/telemetry/app/TelemetryUtils.jsm
index d361eacd0fb86..e1e0aef3d4faf 100644
--- a/toolkit/components/telemetry/app/TelemetryUtils.jsm
+++ b/toolkit/components/telemetry/app/TelemetryUtils.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["TelemetryUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { TelemetryControllerBase } = ChromeUtils.import(
"resource://gre/modules/TelemetryControllerBase.jsm"
);
diff --git a/toolkit/components/telemetry/pings/CoveragePing.jsm b/toolkit/components/telemetry/pings/CoveragePing.jsm
index 7a20b35de0d8c..a91d39a277a64 100644
--- a/toolkit/components/telemetry/pings/CoveragePing.jsm
+++ b/toolkit/components/telemetry/pings/CoveragePing.jsm
@@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
const lazy = {};
diff --git a/toolkit/components/telemetry/pings/EventPing.jsm b/toolkit/components/telemetry/pings/EventPing.jsm
index 8421a1284c1ab..2a2500ec014ae 100644
--- a/toolkit/components/telemetry/pings/EventPing.jsm
+++ b/toolkit/components/telemetry/pings/EventPing.jsm
@@ -11,7 +11,6 @@
var EXPORTED_SYMBOLS = ["TelemetryEventPing", "Policy"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { TelemetryUtils } = ChromeUtils.import(
"resource://gre/modules/TelemetryUtils.jsm"
);
diff --git a/toolkit/components/telemetry/pings/HealthPing.jsm b/toolkit/components/telemetry/pings/HealthPing.jsm
index de5d6694f5828..bdf24cd92b853 100644
--- a/toolkit/components/telemetry/pings/HealthPing.jsm
+++ b/toolkit/components/telemetry/pings/HealthPing.jsm
@@ -10,7 +10,6 @@
var EXPORTED_SYMBOLS = ["TelemetryHealthPing", "Policy"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { TelemetryUtils } = ChromeUtils.import(
"resource://gre/modules/TelemetryUtils.jsm"
);
diff --git a/toolkit/components/telemetry/pings/ModulesPing.jsm b/toolkit/components/telemetry/pings/ModulesPing.jsm
index 7479b7e1a16fa..fc8a1cb7b8afc 100644
--- a/toolkit/components/telemetry/pings/ModulesPing.jsm
+++ b/toolkit/components/telemetry/pings/ModulesPing.jsm
@@ -8,7 +8,6 @@ const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/telemetry/pings/PrioPing.jsm b/toolkit/components/telemetry/pings/PrioPing.jsm
index 069bf4be8778e..9da9e2299c919 100644
--- a/toolkit/components/telemetry/pings/PrioPing.jsm
+++ b/toolkit/components/telemetry/pings/PrioPing.jsm
@@ -25,7 +25,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
const { TelemetryUtils } = ChromeUtils.import(
"resource://gre/modules/TelemetryUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const Utils = TelemetryUtils;
diff --git a/toolkit/components/telemetry/pings/TelemetrySession.jsm b/toolkit/components/telemetry/pings/TelemetrySession.jsm
index 3a16ff3bc34eb..635d4f42589a6 100644
--- a/toolkit/components/telemetry/pings/TelemetrySession.jsm
+++ b/toolkit/components/telemetry/pings/TelemetrySession.jsm
@@ -6,7 +6,6 @@
"use strict";
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/telemetry/pings/UninstallPing.jsm b/toolkit/components/telemetry/pings/UninstallPing.jsm
index ee8d9492304f1..8633af75dbead 100644
--- a/toolkit/components/telemetry/pings/UninstallPing.jsm
+++ b/toolkit/components/telemetry/pings/UninstallPing.jsm
@@ -8,7 +8,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/telemetry/pings/UntrustedModulesPing.jsm b/toolkit/components/telemetry/pings/UntrustedModulesPing.jsm
index cc0d9ff4ea85c..8cceb8d60ed8e 100644
--- a/toolkit/components/telemetry/pings/UntrustedModulesPing.jsm
+++ b/toolkit/components/telemetry/pings/UntrustedModulesPing.jsm
@@ -14,7 +14,6 @@
var EXPORTED_SYMBOLS = ["TelemetryUntrustedModulesPing"];
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/telemetry/pings/UpdatePing.jsm b/toolkit/components/telemetry/pings/UpdatePing.jsm
index f1143ae474e8e..25d5a9aea0f77 100644
--- a/toolkit/components/telemetry/pings/UpdatePing.jsm
+++ b/toolkit/components/telemetry/pings/UpdatePing.jsm
@@ -6,7 +6,6 @@
"use strict";
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { TelemetryUtils } = ChromeUtils.import(
"resource://gre/modules/TelemetryUtils.jsm"
);
diff --git a/toolkit/components/telemetry/tests/unit/TelemetryArchiveTesting.jsm b/toolkit/components/telemetry/tests/unit/TelemetryArchiveTesting.jsm
index ac06fdfe3ae88..0983b817a4f2f 100644
--- a/toolkit/components/telemetry/tests/unit/TelemetryArchiveTesting.jsm
+++ b/toolkit/components/telemetry/tests/unit/TelemetryArchiveTesting.jsm
@@ -1,7 +1,6 @@
const { TelemetryArchive } = ChromeUtils.import(
"resource://gre/modules/TelemetryArchive.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var EXPORTED_SYMBOLS = ["TelemetryArchiveTesting"];
diff --git a/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.jsm b/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.jsm
index 40613b0ebbe89..bcb58ec72872b 100644
--- a/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.jsm
+++ b/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.jsm
@@ -4,7 +4,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/telemetry/tests/utils/TelemetryTestUtils.jsm b/toolkit/components/telemetry/tests/utils/TelemetryTestUtils.jsm
index 2c7626f160107..045d647e1bb76 100644
--- a/toolkit/components/telemetry/tests/utils/TelemetryTestUtils.jsm
+++ b/toolkit/components/telemetry/tests/utils/TelemetryTestUtils.jsm
@@ -6,7 +6,6 @@
const EXPORTED_SYMBOLS = ["TelemetryTestUtils"];
const { Assert } = ChromeUtils.import("resource://testing-common/Assert.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var TelemetryTestUtils = {
/* Scalars */
diff --git a/toolkit/components/terminator/TerminatorTelemetry.jsm b/toolkit/components/terminator/TerminatorTelemetry.jsm
index 047fcc954a6a9..0699efafb44f9 100644
--- a/toolkit/components/terminator/TerminatorTelemetry.jsm
+++ b/toolkit/components/terminator/TerminatorTelemetry.jsm
@@ -18,7 +18,6 @@ ChromeUtils.defineModuleGetter(
"setTimeout",
"resource://gre/modules/Timer.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
function nsTerminatorTelemetry() {}
diff --git a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
index 054ab6636cd73..b0e28ce47d91c 100644
--- a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
+++ b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
@@ -24,7 +24,6 @@ const ABOUT_NEWTAB_SEGREGATION_PREF =
const { PageThumbs, PageThumbsStorage } = ChromeUtils.import(
"resource://gre/modules/PageThumbs.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
// possible FX_THUMBNAILS_BG_CAPTURE_DONE_REASON_2 telemetry values
const TEL_CAPTURE_DONE_OK = 0;
diff --git a/toolkit/components/thumbnails/PageThumbUtils.jsm b/toolkit/components/thumbnails/PageThumbUtils.jsm
index 9518fe65fbcc7..c6022c2514465 100644
--- a/toolkit/components/thumbnails/PageThumbUtils.jsm
+++ b/toolkit/components/thumbnails/PageThumbUtils.jsm
@@ -9,8 +9,6 @@
var EXPORTED_SYMBOLS = ["PageThumbUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/components/thumbnails/PageThumbs.jsm b/toolkit/components/thumbnails/PageThumbs.jsm
index b12939983119c..625537657c182 100644
--- a/toolkit/components/thumbnails/PageThumbs.jsm
+++ b/toolkit/components/thumbnails/PageThumbs.jsm
@@ -28,7 +28,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { BasePromiseWorker } = ChromeUtils.import(
"resource://gre/modules/PromiseWorker.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/components/timermanager/UpdateTimerManager.jsm b/toolkit/components/timermanager/UpdateTimerManager.jsm
index 613a998493e75..36a89074ffa15 100644
--- a/toolkit/components/timermanager/UpdateTimerManager.jsm
+++ b/toolkit/components/timermanager/UpdateTimerManager.jsm
@@ -5,7 +5,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const PREF_APP_UPDATE_LASTUPDATETIME_FMT = "app.update.lastUpdateTime.%ID%";
const PREF_APP_UPDATE_TIMERMINIMUMDELAY = "app.update.timerMinimumDelay";
diff --git a/toolkit/components/tooltiptext/TooltipTextProvider.jsm b/toolkit/components/tooltiptext/TooltipTextProvider.jsm
index 399e0ca0b3357..e8f312cc5950d 100644
--- a/toolkit/components/tooltiptext/TooltipTextProvider.jsm
+++ b/toolkit/components/tooltiptext/TooltipTextProvider.jsm
@@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
function TooltipTextProvider() {}
TooltipTextProvider.prototype = {
diff --git a/toolkit/components/url-classifier/SafeBrowsing.jsm b/toolkit/components/url-classifier/SafeBrowsing.jsm
index 6812d6036412e..74c1935f5938b 100644
--- a/toolkit/components/url-classifier/SafeBrowsing.jsm
+++ b/toolkit/components/url-classifier/SafeBrowsing.jsm
@@ -4,8 +4,6 @@
var EXPORTED_SYMBOLS = ["SafeBrowsing"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const PREF_DEBUG_ENABLED = "browser.safebrowsing.debug";
let loggingEnabled = false;
diff --git a/toolkit/components/url-classifier/UrlClassifierHashCompleter.jsm b/toolkit/components/url-classifier/UrlClassifierHashCompleter.jsm
index bed9f9bebf1a2..1f903cd1dba06 100644
--- a/toolkit/components/url-classifier/UrlClassifierHashCompleter.jsm
+++ b/toolkit/components/url-classifier/UrlClassifierHashCompleter.jsm
@@ -15,7 +15,6 @@ const PREF_DEBUG_ENABLED = "browser.safebrowsing.debug";
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
const lazy = {};
diff --git a/toolkit/components/url-classifier/UrlClassifierLib.jsm b/toolkit/components/url-classifier/UrlClassifierLib.jsm
index dde3e3d0b07d3..38d12cf91b2b8 100644
--- a/toolkit/components/url-classifier/UrlClassifierLib.jsm
+++ b/toolkit/components/url-classifier/UrlClassifierLib.jsm
@@ -6,8 +6,6 @@
// the common JS files used by safebrowsing and url-classifier into a
// single component.
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const PREF_DISABLE_TEST_BACKOFF =
"browser.safebrowsing.provider.test.disableBackoff";
/**
diff --git a/toolkit/components/url-classifier/UrlClassifierListManager.jsm b/toolkit/components/url-classifier/UrlClassifierListManager.jsm
index a8ce1bc57c67b..02dd28371eb37 100644
--- a/toolkit/components/url-classifier/UrlClassifierListManager.jsm
+++ b/toolkit/components/url-classifier/UrlClassifierListManager.jsm
@@ -2,7 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/url-classifier/tests/UrlClassifierTestUtils.jsm b/toolkit/components/url-classifier/tests/UrlClassifierTestUtils.jsm
index e827199276347..8d6f95244cb5f 100644
--- a/toolkit/components/url-classifier/tests/UrlClassifierTestUtils.jsm
+++ b/toolkit/components/url-classifier/tests/UrlClassifierTestUtils.jsm
@@ -20,8 +20,6 @@ const SOCIAL_TRACKING_TABLE_NAME = "mochitest4-track-simple";
const SOCIAL_TRACKING_TABLE_PREF =
"urlclassifier.features.socialtracking.blacklistTables";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
var UrlClassifierTestUtils = {
diff --git a/toolkit/components/urlformatter/URLFormatter.jsm b/toolkit/components/urlformatter/URLFormatter.jsm
index 64d26198abd4d..b6df94049159a 100644
--- a/toolkit/components/urlformatter/URLFormatter.jsm
+++ b/toolkit/components/urlformatter/URLFormatter.jsm
@@ -16,7 +16,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/utils/ClientEnvironment.jsm b/toolkit/components/utils/ClientEnvironment.jsm
index 5c1cae8b34cd5..88120d64606d8 100644
--- a/toolkit/components/utils/ClientEnvironment.jsm
+++ b/toolkit/components/utils/ClientEnvironment.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/utils/FilterExpressions.jsm b/toolkit/components/utils/FilterExpressions.jsm
index 716c16f2d18b0..ad58ea37ec297 100644
--- a/toolkit/components/utils/FilterExpressions.jsm
+++ b/toolkit/components/utils/FilterExpressions.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/components/utils/WindowsInstallsInfo.jsm b/toolkit/components/utils/WindowsInstallsInfo.jsm
index 98eb41eb17540..03c7cfd4cc14c 100644
--- a/toolkit/components/utils/WindowsInstallsInfo.jsm
+++ b/toolkit/components/utils/WindowsInstallsInfo.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["WindowsInstallsInfo"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var WindowsInstallsInfo = {
/**
* Retrieve install paths of this app, based on the values in the TaskBarIDs registry key.
diff --git a/toolkit/components/xulstore/old/XULStore.jsm b/toolkit/components/xulstore/old/XULStore.jsm
index cdae7dd8f616e..686b581970511 100644
--- a/toolkit/components/xulstore/old/XULStore.jsm
+++ b/toolkit/components/xulstore/old/XULStore.jsm
@@ -12,8 +12,6 @@ const WRITE_DELAY_MS = (debugMode ? 3 : 30) * 1000;
const XULSTORE_CID = Components.ID("{6f46b6f4-c8b1-4bd4-a4fa-9ebbed0753ea}");
const STOREDB_FILENAME = "xulstore.json";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(lazy, "OS", "resource://gre/modules/osfile.jsm");
diff --git a/toolkit/crashreporter/CrashReports.jsm b/toolkit/crashreporter/CrashReports.jsm
index e9c5a6956f042..9cab0419afd71 100644
--- a/toolkit/crashreporter/CrashReports.jsm
+++ b/toolkit/crashreporter/CrashReports.jsm
@@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var EXPORTED_SYMBOLS = ["CrashReports"];
var CrashReports = {
diff --git a/toolkit/crashreporter/CrashSubmit.jsm b/toolkit/crashreporter/CrashSubmit.jsm
index e0de0b6516ffe..fe42d9f8771f9 100644
--- a/toolkit/crashreporter/CrashSubmit.jsm
+++ b/toolkit/crashreporter/CrashSubmit.jsm
@@ -2,7 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { FileUtils } = ChromeUtils.import(
"resource://gre/modules/FileUtils.jsm"
);
diff --git a/toolkit/crashreporter/test/CrashTestUtils.jsm b/toolkit/crashreporter/test/CrashTestUtils.jsm
index b978abfed5c24..eca1c58f93769 100644
--- a/toolkit/crashreporter/test/CrashTestUtils.jsm
+++ b/toolkit/crashreporter/test/CrashTestUtils.jsm
@@ -45,7 +45,6 @@ var CrashTestUtils = {
};
// Grab APIs from the testcrasher shared library
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { ctypes } = ChromeUtils.import("resource://gre/modules/ctypes.jsm");
var dir = Services.dirsvc.get("CurWorkD", Ci.nsIFile);
var file = dir.clone();
diff --git a/toolkit/modules/AboutPagesUtils.jsm b/toolkit/modules/AboutPagesUtils.jsm
index 2b5f27ac86523..6aa9c0a3954be 100644
--- a/toolkit/modules/AboutPagesUtils.jsm
+++ b/toolkit/modules/AboutPagesUtils.jsm
@@ -8,7 +8,6 @@
const EXPORTED_SYMBOLS = ["AboutPagesUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/modules/ActorManagerParent.jsm b/toolkit/modules/ActorManagerParent.jsm
index d3d42f212c03e..fc4d225aeda5d 100644
--- a/toolkit/modules/ActorManagerParent.jsm
+++ b/toolkit/modules/ActorManagerParent.jsm
@@ -14,7 +14,6 @@ var EXPORTED_SYMBOLS = ["ActorManagerParent"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm
index 9311d06758452..15125bcca044d 100644
--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -8,9 +8,6 @@
"use strict";
const lazy = {};
-const { Services } = ChromeUtils.import(
- "resource://gre/modules/Services.jsm"
-);
ChromeUtils.defineModuleGetter(lazy, "AddonManager", "resource://gre/modules/AddonManager.jsm");
var EXPORTED_SYMBOLS = ["AppConstants"];
diff --git a/toolkit/modules/AppMenuNotifications.jsm b/toolkit/modules/AppMenuNotifications.jsm
index 7b67ab49251cc..8c2a561cea979 100644
--- a/toolkit/modules/AppMenuNotifications.jsm
+++ b/toolkit/modules/AppMenuNotifications.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["AppMenuNotifications"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
function AppMenuNotification(id, mainAction, secondaryAction, options = {}) {
this.id = id;
this.mainAction = mainAction;
diff --git a/toolkit/modules/AsanReporter.jsm b/toolkit/modules/AsanReporter.jsm
index 2c6438c2e59ed..32e7dee13a6a9 100644
--- a/toolkit/modules/AsanReporter.jsm
+++ b/toolkit/modules/AsanReporter.jsm
@@ -8,7 +8,6 @@ const EXPORTED_SYMBOLS = ["AsanReporter"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/modules/AsyncPrefs.jsm b/toolkit/modules/AsyncPrefs.jsm
index 2834c484c9197..afb44439c0c6d 100644
--- a/toolkit/modules/AsyncPrefs.jsm
+++ b/toolkit/modules/AsyncPrefs.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["AsyncPrefs", "AsyncPrefsChild", "AsyncPrefsParent"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const kInChildProcess =
Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT;
diff --git a/toolkit/modules/BrowserTelemetryUtils.jsm b/toolkit/modules/BrowserTelemetryUtils.jsm
index 86da4be7cb678..eb1041452f4be 100644
--- a/toolkit/modules/BrowserTelemetryUtils.jsm
+++ b/toolkit/modules/BrowserTelemetryUtils.jsm
@@ -7,7 +7,6 @@
var EXPORTED_SYMBOLS = ["BrowserTelemetryUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/modules/BrowserUtils.jsm b/toolkit/modules/BrowserUtils.jsm
index 6d02e9d37a206..ac04db1adee68 100644
--- a/toolkit/modules/BrowserUtils.jsm
+++ b/toolkit/modules/BrowserUtils.jsm
@@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = ["BrowserUtils"];
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/modules/CertUtils.jsm b/toolkit/modules/CertUtils.jsm
index 680f8ae73f61c..74e11b915f3c4 100644
--- a/toolkit/modules/CertUtils.jsm
+++ b/toolkit/modules/CertUtils.jsm
@@ -6,8 +6,6 @@ var EXPORTED_SYMBOLS = ["CertUtils"];
const Ce = Components.Exception;
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
/**
* Reads a set of expected certificate attributes from preferences. The returned
* array can be passed to validateCert or checkCert to validate that a
diff --git a/toolkit/modules/Console.jsm b/toolkit/modules/Console.jsm
index 0d9849c439ab7..7aca6e180db16 100644
--- a/toolkit/modules/Console.jsm
+++ b/toolkit/modules/Console.jsm
@@ -22,8 +22,6 @@
var EXPORTED_SYMBOLS = ["console", "ConsoleAPI"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var gTimerRegistry = new Map();
/**
diff --git a/toolkit/modules/ContentDOMReference.jsm b/toolkit/modules/ContentDOMReference.jsm
index 3b99d5a0726b1..04dfc18daaaef 100644
--- a/toolkit/modules/ContentDOMReference.jsm
+++ b/toolkit/modules/ContentDOMReference.jsm
@@ -57,9 +57,6 @@ var gRegistry = new WeakMap();
var ContentDOMReference = {
_init() {
- const { Services } = ChromeUtils.import(
- "resource://gre/modules/Services.jsm"
- );
Services.obs.addObserver(this, FINALIZATION_TOPIC);
},
diff --git a/toolkit/modules/DateTimePickerPanel.jsm b/toolkit/modules/DateTimePickerPanel.jsm
index d7ea6c6e4ba31..6422b8a658aa3 100644
--- a/toolkit/modules/DateTimePickerPanel.jsm
+++ b/toolkit/modules/DateTimePickerPanel.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["DateTimePickerPanel"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var DateTimePickerPanel = class {
constructor(element) {
this.element = element;
diff --git a/toolkit/modules/Deprecated.jsm b/toolkit/modules/Deprecated.jsm
index 8fb9a357232db..b96bfa497ea29 100644
--- a/toolkit/modules/Deprecated.jsm
+++ b/toolkit/modules/Deprecated.jsm
@@ -8,8 +8,6 @@ var EXPORTED_SYMBOLS = ["Deprecated"];
const PREF_DEPRECATION_WARNINGS = "devtools.errorconsole.deprecation_warnings";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
// A flag that indicates whether deprecation warnings should be logged.
var logWarnings = Services.prefs.getBoolPref(PREF_DEPRECATION_WARNINGS);
diff --git a/toolkit/modules/E10SUtils.jsm b/toolkit/modules/E10SUtils.jsm
index a51638b39fd61..7e7189ebc41c6 100644
--- a/toolkit/modules/E10SUtils.jsm
+++ b/toolkit/modules/E10SUtils.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["E10SUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/modules/EventEmitter.jsm b/toolkit/modules/EventEmitter.jsm
index 96f42b7405f9e..e09e4ae319262 100644
--- a/toolkit/modules/EventEmitter.jsm
+++ b/toolkit/modules/EventEmitter.jsm
@@ -4,8 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/modules/FileUtils.jsm b/toolkit/modules/FileUtils.jsm
index cb28d90c1632b..2da64bfefdd33 100644
--- a/toolkit/modules/FileUtils.jsm
+++ b/toolkit/modules/FileUtils.jsm
@@ -5,8 +5,6 @@
var EXPORTED_SYMBOLS = ["FileUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/modules/FindBarContent.jsm b/toolkit/modules/FindBarContent.jsm
index 82a8b7d409dba..b43c6f9a1f305 100644
--- a/toolkit/modules/FindBarContent.jsm
+++ b/toolkit/modules/FindBarContent.jsm
@@ -10,8 +10,6 @@ const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
/* Please keep in sync with toolkit/content/widgets/findbar.js */
const FIND_NORMAL = 0;
const FIND_TYPEAHEAD = 1;
diff --git a/toolkit/modules/Finder.jsm b/toolkit/modules/Finder.jsm
index 8a7411706c5cf..98d0b21e9bf53 100644
--- a/toolkit/modules/Finder.jsm
+++ b/toolkit/modules/Finder.jsm
@@ -13,7 +13,6 @@ const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
const { Rect } = ChromeUtils.import("resource://gre/modules/Geometry.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
diff --git a/toolkit/modules/FinderHighlighter.jsm b/toolkit/modules/FinderHighlighter.jsm
index 91e2f9ffb9680..7eb387fce653e 100644
--- a/toolkit/modules/FinderHighlighter.jsm
+++ b/toolkit/modules/FinderHighlighter.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["FinderHighlighter"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/modules/FinderIterator.jsm b/toolkit/modules/FinderIterator.jsm
index 3f479978cb454..3516f6c67e358 100644
--- a/toolkit/modules/FinderIterator.jsm
+++ b/toolkit/modules/FinderIterator.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["FinderIterator"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { clearTimeout, setTimeout } = ChromeUtils.import(
"resource://gre/modules/Timer.jsm"
);
diff --git a/toolkit/modules/FinderParent.jsm b/toolkit/modules/FinderParent.jsm
index 503d815ab2859..7e054d4a292f8 100644
--- a/toolkit/modules/FinderParent.jsm
+++ b/toolkit/modules/FinderParent.jsm
@@ -10,7 +10,6 @@ const kModalHighlightPref = "findbar.modalHighlight";
const kSoundEnabledPref = "accessibility.typeaheadfind.enablesound";
const kNotFoundSoundPref = "accessibility.typeaheadfind.soundURL";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/modules/FirstStartup.jsm b/toolkit/modules/FirstStartup.jsm
index 257d988e1f031..62a7e1623bb58 100644
--- a/toolkit/modules/FirstStartup.jsm
+++ b/toolkit/modules/FirstStartup.jsm
@@ -7,7 +7,6 @@ var EXPORTED_SYMBOLS = ["FirstStartup"];
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/modules/GMPInstallManager.jsm b/toolkit/modules/GMPInstallManager.jsm
index 9e5b1720057fc..62c236be23b29 100644
--- a/toolkit/modules/GMPInstallManager.jsm
+++ b/toolkit/modules/GMPInstallManager.jsm
@@ -7,7 +7,6 @@
// 1 day default
const DEFAULT_SECONDS_BETWEEN_CHECKS = 60 * 60 * 24;
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { PromiseUtils } = ChromeUtils.import(
"resource://gre/modules/PromiseUtils.jsm"
);
diff --git a/toolkit/modules/GMPUtils.jsm b/toolkit/modules/GMPUtils.jsm
index 603b549e5d52b..9a76916998e41 100644
--- a/toolkit/modules/GMPUtils.jsm
+++ b/toolkit/modules/GMPUtils.jsm
@@ -12,7 +12,6 @@ var EXPORTED_SYMBOLS = [
"WIDEVINE_ID",
];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/modules/HiddenFrame.jsm b/toolkit/modules/HiddenFrame.jsm
index c45ca7abf685c..aab5137542228 100644
--- a/toolkit/modules/HiddenFrame.jsm
+++ b/toolkit/modules/HiddenFrame.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["HiddenFrame"];
const { PromiseUtils } = ChromeUtils.import(
"resource://gre/modules/PromiseUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const XUL_PAGE = "chrome://global/content/win.xhtml";
diff --git a/toolkit/modules/InlineSpellChecker.jsm b/toolkit/modules/InlineSpellChecker.jsm
index 927b012e258e4..080e75dda8c52 100644
--- a/toolkit/modules/InlineSpellChecker.jsm
+++ b/toolkit/modules/InlineSpellChecker.jsm
@@ -5,8 +5,6 @@
var EXPORTED_SYMBOLS = ["InlineSpellChecker", "SpellCheckHelper"];
const MAX_UNDO_STACK_DEPTH = 1;
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
function InlineSpellChecker(aEditor) {
this.init(aEditor);
this.mAddedWordStack = []; // We init this here to preserve it between init/uninit calls
diff --git a/toolkit/modules/JSONFile.jsm b/toolkit/modules/JSONFile.jsm
index 85bf9f6b9a6fd..5a612e14305fa 100644
--- a/toolkit/modules/JSONFile.jsm
+++ b/toolkit/modules/JSONFile.jsm
@@ -64,8 +64,6 @@ const FileInputStream = Components.Constructor(
"init"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
/**
* Delay between a change to the data and the related save operation.
*/
diff --git a/toolkit/modules/JsonSchema.jsm b/toolkit/modules/JsonSchema.jsm
index 583116dec9d40..d7f0d570e653f 100644
--- a/toolkit/modules/JsonSchema.jsm
+++ b/toolkit/modules/JsonSchema.jsm
@@ -9,8 +9,6 @@
* convenience methods whil executing inside a sandbox.
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const sandbox = new Cu.Sandbox(null, {
wantComponents: false,
wantGlobalProperties: ["URL"],
diff --git a/toolkit/modules/LightweightThemeConsumer.jsm b/toolkit/modules/LightweightThemeConsumer.jsm
index a12dfc7746d2e..48931d479f327 100644
--- a/toolkit/modules/LightweightThemeConsumer.jsm
+++ b/toolkit/modules/LightweightThemeConsumer.jsm
@@ -4,8 +4,6 @@
var EXPORTED_SYMBOLS = ["LightweightThemeConsumer"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/modules/Log.jsm b/toolkit/modules/Log.jsm
index dbb8e870431be..a5e83d2c3099e 100644
--- a/toolkit/modules/Log.jsm
+++ b/toolkit/modules/Log.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["Log"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const INTERNAL_FIELDS = new Set(["_level", "_message", "_time", "_namespace"]);
/*
diff --git a/toolkit/modules/NewTabUtils.jsm b/toolkit/modules/NewTabUtils.jsm
index 7da995a77bf92..f815f75c90b28 100644
--- a/toolkit/modules/NewTabUtils.jsm
+++ b/toolkit/modules/NewTabUtils.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["NewTabUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/modules/OSKeyStore.jsm b/toolkit/modules/OSKeyStore.jsm
index 9266b4f7d5f4b..afc329f064430 100644
--- a/toolkit/modules/OSKeyStore.jsm
+++ b/toolkit/modules/OSKeyStore.jsm
@@ -10,7 +10,6 @@
var EXPORTED_SYMBOLS = ["OSKeyStore"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/modules/OsEnvironment.jsm b/toolkit/modules/OsEnvironment.jsm
index 2b0ba43bb6a55..c4d1935d778e0 100644
--- a/toolkit/modules/OsEnvironment.jsm
+++ b/toolkit/modules/OsEnvironment.jsm
@@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = ["OsEnvironment"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/modules/PermissionsUtils.jsm b/toolkit/modules/PermissionsUtils.jsm
index 4ccc5bdd8e7f1..fcaa056ff8086 100644
--- a/toolkit/modules/PermissionsUtils.jsm
+++ b/toolkit/modules/PermissionsUtils.jsm
@@ -4,8 +4,6 @@
var EXPORTED_SYMBOLS = ["PermissionsUtils", "PermissionsTestUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var gImportedPrefBranches = new Set();
function importPrefBranch(aPrefBranch, aPermission, aAction) {
diff --git a/toolkit/modules/PopupNotifications.jsm b/toolkit/modules/PopupNotifications.jsm
index de7fc8537c553..f70a76c8e8598 100644
--- a/toolkit/modules/PopupNotifications.jsm
+++ b/toolkit/modules/PopupNotifications.jsm
@@ -4,7 +4,6 @@
var EXPORTED_SYMBOLS = ["PopupNotifications"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { PrivateBrowsingUtils } = ChromeUtils.import(
"resource://gre/modules/PrivateBrowsingUtils.jsm"
);
diff --git a/toolkit/modules/Preferences.jsm b/toolkit/modules/Preferences.jsm
index 5b7f993bd6c42..0a551854efa5f 100644
--- a/toolkit/modules/Preferences.jsm
+++ b/toolkit/modules/Preferences.jsm
@@ -4,8 +4,6 @@
var EXPORTED_SYMBOLS = ["Preferences"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
// The minimum and maximum integers that can be set as preferences.
// The range of valid values is narrower than the range of valid JS values
// because the native preferences code treats integers as NSPR PRInt32s,
diff --git a/toolkit/modules/PrivateBrowsingUtils.jsm b/toolkit/modules/PrivateBrowsingUtils.jsm
index a151c0222ba52..f59215314bd3c 100644
--- a/toolkit/modules/PrivateBrowsingUtils.jsm
+++ b/toolkit/modules/PrivateBrowsingUtils.jsm
@@ -4,8 +4,6 @@
var EXPORTED_SYMBOLS = ["PrivateBrowsingUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const kAutoStartPref = "browser.privatebrowsing.autostart";
// This will be set to true when the PB mode is autostarted from the command
diff --git a/toolkit/modules/ProfileAge.jsm b/toolkit/modules/ProfileAge.jsm
index 276f8bb71db18..1d46fea8a595e 100644
--- a/toolkit/modules/ProfileAge.jsm
+++ b/toolkit/modules/ProfileAge.jsm
@@ -7,7 +7,6 @@
var EXPORTED_SYMBOLS = ["ProfileAge"];
const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const FILE_TIMES = "times.json";
diff --git a/toolkit/modules/PromiseUtils.jsm b/toolkit/modules/PromiseUtils.jsm
index 704c6d38cf5e6..b3d22cab21b5d 100644
--- a/toolkit/modules/PromiseUtils.jsm
+++ b/toolkit/modules/PromiseUtils.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["PromiseUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var PromiseUtils = {
/*
* Creates a new pending Promise and provide methods to resolve and reject this Promise.
diff --git a/toolkit/modules/PropertyListUtils.jsm b/toolkit/modules/PropertyListUtils.jsm
index 4cbce032bab49..2f9f5a3f90157 100644
--- a/toolkit/modules/PropertyListUtils.jsm
+++ b/toolkit/modules/PropertyListUtils.jsm
@@ -64,7 +64,6 @@ ChromeUtils.defineModuleGetter(
"ctypes",
"resource://gre/modules/ctypes.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var PropertyListUtils = Object.freeze({
/**
diff --git a/toolkit/modules/Region.jsm b/toolkit/modules/Region.jsm
index 3f0564a9c9b33..6b32f5d378ca9 100644
--- a/toolkit/modules/Region.jsm
+++ b/toolkit/modules/Region.jsm
@@ -9,7 +9,6 @@ const EXPORTED_SYMBOLS = ["Region"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/modules/ResetProfile.jsm b/toolkit/modules/ResetProfile.jsm
index 5672627d64566..f6a6de4038a5b 100644
--- a/toolkit/modules/ResetProfile.jsm
+++ b/toolkit/modules/ResetProfile.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["ResetProfile"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/modules/SelectionUtils.jsm b/toolkit/modules/SelectionUtils.jsm
index c214867da963f..3788a3575f989 100644
--- a/toolkit/modules/SelectionUtils.jsm
+++ b/toolkit/modules/SelectionUtils.jsm
@@ -7,8 +7,6 @@
var EXPORTED_SYMBOLS = ["SelectionUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var SelectionUtils = {
/**
* Trim the selection text to a reasonable size and sanitize it to make it
diff --git a/toolkit/modules/ServiceRequest.jsm b/toolkit/modules/ServiceRequest.jsm
index 56abcf3e92490..410e24906656a 100644
--- a/toolkit/modules/ServiceRequest.jsm
+++ b/toolkit/modules/ServiceRequest.jsm
@@ -9,7 +9,6 @@
* can be set, Telemetry collected, etc. in a central place.
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/modules/ShortcutUtils.jsm b/toolkit/modules/ShortcutUtils.jsm
index 470ba583a21f8..6ac047c220bbc 100644
--- a/toolkit/modules/ShortcutUtils.jsm
+++ b/toolkit/modules/ShortcutUtils.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["ShortcutUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/modules/Sqlite.jsm b/toolkit/modules/Sqlite.jsm
index 2adbf05bb89fc..5c0dcf8ef0e43 100644
--- a/toolkit/modules/Sqlite.jsm
+++ b/toolkit/modules/Sqlite.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["Sqlite"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
const lazy = {};
diff --git a/toolkit/modules/SubDialog.jsm b/toolkit/modules/SubDialog.jsm
index c3fd2bdbef903..b2ecd9f3d82cd 100644
--- a/toolkit/modules/SubDialog.jsm
+++ b/toolkit/modules/SubDialog.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["SubDialog", "SubDialogManager"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
/**
* The SubDialog resize callback.
* @callback SubDialog~resizeCallback
diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm
index 72b223fa56118..1bbd482d47b6f 100644
--- a/toolkit/modules/Troubleshoot.jsm
+++ b/toolkit/modules/Troubleshoot.jsm
@@ -7,7 +7,6 @@ var EXPORTED_SYMBOLS = ["Troubleshoot"];
const { AddonManager } = ChromeUtils.import(
"resource://gre/modules/AddonManager.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/modules/UpdateUtils.jsm b/toolkit/modules/UpdateUtils.jsm
index 5257a5dcec0b7..c1369472e9cf9 100644
--- a/toolkit/modules/UpdateUtils.jsm
+++ b/toolkit/modules/UpdateUtils.jsm
@@ -8,7 +8,6 @@ var EXPORTED_SYMBOLS = ["UpdateUtils"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/modules/WebChannel.jsm b/toolkit/modules/WebChannel.jsm
index e4388605c073c..fa0aef3384c79 100644
--- a/toolkit/modules/WebChannel.jsm
+++ b/toolkit/modules/WebChannel.jsm
@@ -12,8 +12,6 @@ var EXPORTED_SYMBOLS = ["WebChannel", "WebChannelBroker"];
const ERRNO_UNKNOWN_ERROR = 999;
const ERROR_UNKNOWN = "UNKNOWN_ERROR";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
/**
* WebChannelBroker is a global object that helps manage WebChannel objects.
* This object handles channel registration, origin validation and message multiplexing.
diff --git a/toolkit/modules/sessionstore/PrivacyLevel.jsm b/toolkit/modules/sessionstore/PrivacyLevel.jsm
index f512c5fad7134..f40e2fbcf6da4 100644
--- a/toolkit/modules/sessionstore/PrivacyLevel.jsm
+++ b/toolkit/modules/sessionstore/PrivacyLevel.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["PrivacyLevel"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const PREF = "browser.sessionstore.privacy_level";
// The following constants represent the different possible privacy levels that
diff --git a/toolkit/modules/sessionstore/SessionHistory.jsm b/toolkit/modules/sessionstore/SessionHistory.jsm
index a545edc4345fd..128885e5b6b2b 100644
--- a/toolkit/modules/sessionstore/SessionHistory.jsm
+++ b/toolkit/modules/sessionstore/SessionHistory.jsm
@@ -6,8 +6,6 @@
var EXPORTED_SYMBOLS = ["SessionHistory"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/modules/subprocess/subprocess_common.jsm b/toolkit/modules/subprocess/subprocess_common.jsm
index c55a9b75a3e9e..f10493f1a2fbf 100644
--- a/toolkit/modules/subprocess/subprocess_common.jsm
+++ b/toolkit/modules/subprocess/subprocess_common.jsm
@@ -7,8 +7,6 @@
/* eslint-disable mozilla/balanced-listeners */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/modules/subprocess/subprocess_unix.jsm b/toolkit/modules/subprocess/subprocess_unix.jsm
index 95e4bffda3a48..5c935f566f861 100644
--- a/toolkit/modules/subprocess/subprocess_unix.jsm
+++ b/toolkit/modules/subprocess/subprocess_unix.jsm
@@ -13,7 +13,6 @@ var EXPORTED_SYMBOLS = ["SubprocessImpl", "libc"];
const { ctypes } = ChromeUtils.import("resource://gre/modules/ctypes.jsm");
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { BaseProcess, PromiseWorker } = ChromeUtils.import(
"resource://gre/modules/subprocess/subprocess_common.jsm"
);
diff --git a/toolkit/modules/subprocess/subprocess_win.jsm b/toolkit/modules/subprocess/subprocess_win.jsm
index 9871cf1239959..85383fc5362be 100644
--- a/toolkit/modules/subprocess/subprocess_win.jsm
+++ b/toolkit/modules/subprocess/subprocess_win.jsm
@@ -16,7 +16,6 @@ const { AppConstants } = ChromeUtils.import(
);
const { ctypes } = ChromeUtils.import("resource://gre/modules/ctypes.jsm");
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/modules/tests/modules/MockDocument.jsm b/toolkit/modules/tests/modules/MockDocument.jsm
index c49ea7566844c..842c3de12970f 100644
--- a/toolkit/modules/tests/modules/MockDocument.jsm
+++ b/toolkit/modules/tests/modules/MockDocument.jsm
@@ -7,7 +7,6 @@
var EXPORTED_SYMBOLS = ["MockDocument"];
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const MockDocument = {
/**
diff --git a/toolkit/modules/tests/modules/OSKeyStoreTestUtils.jsm b/toolkit/modules/tests/modules/OSKeyStoreTestUtils.jsm
index 32f99642527dc..2dc99d16eed27 100644
--- a/toolkit/modules/tests/modules/OSKeyStoreTestUtils.jsm
+++ b/toolkit/modules/tests/modules/OSKeyStoreTestUtils.jsm
@@ -17,7 +17,6 @@ ChromeUtils.defineModuleGetter(
"UpdateUtils",
"resource://gre/modules/UpdateUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
);
diff --git a/toolkit/modules/tests/modules/PromiseTestUtils.jsm b/toolkit/modules/tests/modules/PromiseTestUtils.jsm
index 3cd11c5423432..7ac8d6f812016 100644
--- a/toolkit/modules/tests/modules/PromiseTestUtils.jsm
+++ b/toolkit/modules/tests/modules/PromiseTestUtils.jsm
@@ -10,7 +10,6 @@
var EXPORTED_SYMBOLS = ["PromiseTestUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { Assert } = ChromeUtils.import("resource://testing-common/Assert.jsm");
var PromiseTestUtils = {
diff --git a/toolkit/modules/tests/xpcshell/RegionTestUtils.jsm b/toolkit/modules/tests/xpcshell/RegionTestUtils.jsm
index 6f3811fe45ac7..9ad1fa3e2367a 100644
--- a/toolkit/modules/tests/xpcshell/RegionTestUtils.jsm
+++ b/toolkit/modules/tests/xpcshell/RegionTestUtils.jsm
@@ -1,7 +1,5 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const EXPORTED_SYMBOLS = ["RegionTestUtils"];
const RegionTestUtils = Object.freeze({
diff --git a/toolkit/mozapps/downloads/DownloadLastDir.jsm b/toolkit/mozapps/downloads/DownloadLastDir.jsm
index d7a59b2219804..6300c80c1a5a7 100644
--- a/toolkit/mozapps/downloads/DownloadLastDir.jsm
+++ b/toolkit/mozapps/downloads/DownloadLastDir.jsm
@@ -30,7 +30,6 @@ const nsIFile = Ci.nsIFile;
var EXPORTED_SYMBOLS = ["DownloadLastDir"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { PrivateBrowsingUtils } = ChromeUtils.import(
"resource://gre/modules/PrivateBrowsingUtils.jsm"
);
diff --git a/toolkit/mozapps/downloads/DownloadUtils.jsm b/toolkit/mozapps/downloads/DownloadUtils.jsm
index 4b4d14b1685bf..996c88b946d6f 100644
--- a/toolkit/mozapps/downloads/DownloadUtils.jsm
+++ b/toolkit/mozapps/downloads/DownloadUtils.jsm
@@ -37,8 +37,6 @@ var EXPORTED_SYMBOLS = ["DownloadUtils"];
* convertTimeUnits(double aSecs)
*/
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm
index 14deb400b2626..79f22ca11ff87 100644
--- a/toolkit/mozapps/downloads/HelperAppDlg.jsm
+++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm
@@ -2,7 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/mozapps/extensions/AbuseReporter.jsm b/toolkit/mozapps/extensions/AbuseReporter.jsm
index 74aa746df6bac..005c94cef6b93 100644
--- a/toolkit/mozapps/extensions/AbuseReporter.jsm
+++ b/toolkit/mozapps/extensions/AbuseReporter.jsm
@@ -7,7 +7,6 @@ const EXPORTED_SYMBOLS = ["AbuseReporter", "AbuseReportError"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/mozapps/extensions/AddonManager.jsm b/toolkit/mozapps/extensions/AddonManager.jsm
index 838c4c843fb27..744df489ac5f1 100644
--- a/toolkit/mozapps/extensions/AddonManager.jsm
+++ b/toolkit/mozapps/extensions/AddonManager.jsm
@@ -71,7 +71,6 @@ const AMO_ATTRIBUTION_DATA_KEYS = [
];
const AMO_ATTRIBUTION_DATA_MAX_LENGTH = 40;
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/mozapps/extensions/Blocklist.jsm b/toolkit/mozapps/extensions/Blocklist.jsm
index f1569a4fd2892..fe04ceab5f456 100644
--- a/toolkit/mozapps/extensions/Blocklist.jsm
+++ b/toolkit/mozapps/extensions/Blocklist.jsm
@@ -13,7 +13,6 @@ var EXPORTED_SYMBOLS = ["Blocklist", "BlocklistPrivate"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/mozapps/extensions/amContentHandler.jsm b/toolkit/mozapps/extensions/amContentHandler.jsm
index 3b779b27db29d..4b50efb306614 100644
--- a/toolkit/mozapps/extensions/amContentHandler.jsm
+++ b/toolkit/mozapps/extensions/amContentHandler.jsm
@@ -7,7 +7,6 @@
const XPI_CONTENT_TYPE = "application/x-xpinstall";
const MSG_INSTALL_ADDON = "WebInstallerInstallAddonFromWebpage";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/mozapps/extensions/amInstallTrigger.jsm b/toolkit/mozapps/extensions/amInstallTrigger.jsm
index 5a8362264fc97..30eac386a807a 100644
--- a/toolkit/mozapps/extensions/amInstallTrigger.jsm
+++ b/toolkit/mozapps/extensions/amInstallTrigger.jsm
@@ -4,7 +4,6 @@
"use strict";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { Preferences } = ChromeUtils.import(
"resource://gre/modules/Preferences.jsm"
);
diff --git a/toolkit/mozapps/extensions/amWebAPI.jsm b/toolkit/mozapps/extensions/amWebAPI.jsm
index cc9b3a11aa148..158897f857669 100644
--- a/toolkit/mozapps/extensions/amWebAPI.jsm
+++ b/toolkit/mozapps/extensions/amWebAPI.jsm
@@ -7,7 +7,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/mozapps/extensions/internal/AddonRepository.jsm b/toolkit/mozapps/extensions/internal/AddonRepository.jsm
index 481701e4300b7..3e0859db854c4 100644
--- a/toolkit/mozapps/extensions/internal/AddonRepository.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonRepository.jsm
@@ -7,7 +7,6 @@
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazy = {};
diff --git a/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm b/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm
index bd93a8dc74a75..2c03e40bcfc49 100644
--- a/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm
@@ -21,7 +21,6 @@ const { FileUtils } = ChromeUtils.import(
"resource://gre/modules/FileUtils.jsm"
);
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
index 032b1148d4d9d..3033a7c5d1bae 100644
--- a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
@@ -14,8 +14,6 @@ var EXPORTED_SYMBOLS = ["AddonUpdateChecker"];
const TIMEOUT = 60 * 1000;
const TOOLKIT_ID = "toolkit@mozilla.org";
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.jsm b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
index 9e921b9f3dc57..f829bebc38a08 100644
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["GMPTestUtils"];
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
index f274891cf304b..3ed3fa45c1d83 100644
--- a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
@@ -16,7 +16,6 @@
var EXPORTED_SYMBOLS = ["AddonInternal", "XPIDatabase", "XPIDatabaseReconcile"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
index 040814af6f74e..4eb079ddfb397 100644
--- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
@@ -23,7 +23,6 @@ var EXPORTED_SYMBOLS = [
"verifyBundleSignedState",
];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 39fa8b4208717..6701758f65140 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -19,7 +19,6 @@
var EXPORTED_SYMBOLS = ["XPIProvider", "XPIInternal"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/mozapps/handling/ContentDispatchChooser.jsm b/toolkit/mozapps/handling/ContentDispatchChooser.jsm
index dbaf6ff192fb3..816098e04f956 100644
--- a/toolkit/mozapps/handling/ContentDispatchChooser.jsm
+++ b/toolkit/mozapps/handling/ContentDispatchChooser.jsm
@@ -4,7 +4,6 @@
// Constants
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/mozapps/update/BackgroundTask_backgroundupdate.jsm b/toolkit/mozapps/update/BackgroundTask_backgroundupdate.jsm
index b7a5c56512228..0070349b661f0 100644
--- a/toolkit/mozapps/update/BackgroundTask_backgroundupdate.jsm
+++ b/toolkit/mozapps/update/BackgroundTask_backgroundupdate.jsm
@@ -18,7 +18,6 @@ const { EXIT_CODE } = BackgroundUpdate;
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/mozapps/update/BackgroundUpdate.jsm b/toolkit/mozapps/update/BackgroundUpdate.jsm
index d6b01fb09ac1f..46d1603fe57b1 100644
--- a/toolkit/mozapps/update/BackgroundUpdate.jsm
+++ b/toolkit/mozapps/update/BackgroundUpdate.jsm
@@ -13,7 +13,6 @@ const { AppConstants } = ChromeUtils.import(
const { BackgroundTasksManager } = ChromeUtils.import(
"resource://gre/modules/BackgroundTasksManager.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/mozapps/update/UpdateListener.jsm b/toolkit/mozapps/update/UpdateListener.jsm
index d84a489709e32..87b08e0322203 100644
--- a/toolkit/mozapps/update/UpdateListener.jsm
+++ b/toolkit/mozapps/update/UpdateListener.jsm
@@ -6,7 +6,6 @@
var EXPORTED_SYMBOLS = ["UpdateListener"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/mozapps/update/UpdateService.jsm b/toolkit/mozapps/update/UpdateService.jsm
index edaf847d33af9..17d7f91d65ebf 100644
--- a/toolkit/mozapps/update/UpdateService.jsm
+++ b/toolkit/mozapps/update/UpdateService.jsm
@@ -21,7 +21,6 @@ const {
const { FileUtils } = ChromeUtils.import(
"resource://gre/modules/FileUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
diff --git a/toolkit/mozapps/update/UpdateServiceStub.jsm b/toolkit/mozapps/update/UpdateServiceStub.jsm
index ecaf4fd45d8a2..f387e9f66d6b7 100644
--- a/toolkit/mozapps/update/UpdateServiceStub.jsm
+++ b/toolkit/mozapps/update/UpdateServiceStub.jsm
@@ -9,7 +9,6 @@ const { XPCOMUtils } = ChromeUtils.import(
const { FileUtils } = ChromeUtils.import(
"resource://gre/modules/FileUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/mozapps/update/UpdateTelemetry.jsm b/toolkit/mozapps/update/UpdateTelemetry.jsm
index e75fd504866a7..36d044f173732 100644
--- a/toolkit/mozapps/update/UpdateTelemetry.jsm
+++ b/toolkit/mozapps/update/UpdateTelemetry.jsm
@@ -12,7 +12,6 @@ const { AppConstants } = ChromeUtils.import(
const { BitsError, BitsUnknownError } = ChromeUtils.import(
"resource://gre/modules/Bits.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var AUSTLMY = {
// Telemetry for the application update background update check occurs when
diff --git a/tools/code-coverage/PerTestCoverageUtils.jsm b/tools/code-coverage/PerTestCoverageUtils.jsm
index 7e860090593fd..e7a5050ce214a 100644
--- a/tools/code-coverage/PerTestCoverageUtils.jsm
+++ b/tools/code-coverage/PerTestCoverageUtils.jsm
@@ -8,8 +8,6 @@
var EXPORTED_SYMBOLS = ["PerTestCoverageUtils"];
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const env = Cc["@mozilla.org/process/environment;1"].getService(
Ci.nsIEnvironment
);
diff --git a/uriloader/exthandler/ExtHandlerService.jsm b/uriloader/exthandler/ExtHandlerService.jsm
index 8573d3c3dd3c5..a406686f100d5 100644
--- a/uriloader/exthandler/ExtHandlerService.jsm
+++ b/uriloader/exthandler/ExtHandlerService.jsm
@@ -10,7 +10,6 @@ const { AppConstants } = ChromeUtils.import(
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const {
saveToDisk,
diff --git a/uriloader/exthandler/WebHandlerApp.jsm b/uriloader/exthandler/WebHandlerApp.jsm
index 8ee4f65710bfb..958edbd580921 100644
--- a/uriloader/exthandler/WebHandlerApp.jsm
+++ b/uriloader/exthandler/WebHandlerApp.jsm
@@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
const lazy = {};
ChromeUtils.defineModuleGetter(
diff --git a/uriloader/exthandler/tests/HandlerServiceTestUtils.jsm b/uriloader/exthandler/tests/HandlerServiceTestUtils.jsm
index c30b5b0dc871c..4d112c201e6cc 100644
--- a/uriloader/exthandler/tests/HandlerServiceTestUtils.jsm
+++ b/uriloader/exthandler/tests/HandlerServiceTestUtils.jsm
@@ -38,8 +38,6 @@ XPCOMUtils.defineLazyServiceGetter(
"nsIHandlerService"
);
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
var HandlerServiceTestUtils = {
/**
* Retrieves the names of all the MIME types and protocols configured in the
--
GitLab