diff --git a/accessible/tests/mochitest/browser.js b/accessible/tests/mochitest/browser.js index ffe67b0ed0db..da68ceb732a3 100644 --- a/accessible/tests/mochitest/browser.js +++ b/accessible/tests/mochitest/browser.js @@ -95,8 +95,6 @@ function reloadButton() { // ////////////////////////////////////////////////////////////////////////////// // private section -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var gBrowserContext = { browserWnd: null, testFunc: null, diff --git a/accessible/tests/mochitest/common.js b/accessible/tests/mochitest/common.js index 21e56c766030..01b3089b2779 100644 --- a/accessible/tests/mochitest/common.js +++ b/accessible/tests/mochitest/common.js @@ -103,7 +103,6 @@ const MAX_TRIM_LENGTH = 100; /** * Services to determine if e10s is enabled. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); /** * nsIAccessibilityService service. diff --git a/accessible/tests/mochitest/events.js b/accessible/tests/mochitest/events.js index 92e4379d054c..fbb935ab0b4a 100644 --- a/accessible/tests/mochitest/events.js +++ b/accessible/tests/mochitest/events.js @@ -51,8 +51,6 @@ const kFromUserInput = 1; // ////////////////////////////////////////////////////////////////////////////// // General -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - /** * Set up this variable to dump events into DOM. */ diff --git a/browser/base/content/aboutDialog-appUpdater.js b/browser/base/content/aboutDialog-appUpdater.js index b29726c1aab2..109dc566d912 100644 --- a/browser/base/content/aboutDialog-appUpdater.js +++ b/browser/base/content/aboutDialog-appUpdater.js @@ -7,7 +7,6 @@ /* import-globals-from aboutDialog.js */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index 69e7c510b305..7735f0cdcd07 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -7,7 +7,6 @@ /* import-globals-from aboutDialog-appUpdater.js */ // Services = object with smart getters for common XPCOM services -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); diff --git a/browser/base/content/aboutRestartRequired.js b/browser/base/content/aboutRestartRequired.js index 9fd1f575367f..05eff8dc33a4 100644 --- a/browser/base/content/aboutRestartRequired.js +++ b/browser/base/content/aboutRestartRequired.js @@ -3,7 +3,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /* eslint-env mozilla/frame-script */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var AboutRestartRequired = { /* Only do autofocus if we're the toplevel frame; otherwise we diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 42bf844462a3..ddbafce92822 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -6,7 +6,6 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); diff --git a/browser/base/content/safeMode.js b/browser/base/content/safeMode.js index 5c810b031a8a..abb7c94c2da6 100644 --- a/browser/base/content/safeMode.js +++ b/browser/base/content/safeMode.js @@ -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"); - const appStartup = Services.startup; const { ResetProfile } = ChromeUtils.import( diff --git a/browser/base/content/sanitizeDialog.js b/browser/base/content/sanitizeDialog.js index 06baa4387d21..4343dc60b652 100644 --- a/browser/base/content/sanitizeDialog.js +++ b/browser/base/content/sanitizeDialog.js @@ -6,7 +6,6 @@ /* import-globals-from /toolkit/content/preferencesBindings.js */ var { Sanitizer } = ChromeUtils.import("resource:///modules/Sanitizer.jsm"); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); Preferences.addAll([ { id: "privacy.cpd.history", type: "bool" }, diff --git a/browser/base/content/test/static/head.js b/browser/base/content/test/static/head.js index 52828401249a..f13bfba940c4 100644 --- a/browser/base/content/test/static/head.js +++ b/browser/base/content/test/static/head.js @@ -20,7 +20,6 @@ const IS_ALPHA = /^[a-z]+$/i; var { PerfTestHelpers } = ChromeUtils.import( "resource://testing-common/PerfTestHelpers.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { OS, require } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); /** diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js index 558ef9e31b16..eb9878f16852 100644 --- a/browser/base/content/utilityOverlay.js +++ b/browser/base/content/utilityOverlay.js @@ -7,7 +7,6 @@ var { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/browser/base/content/webrtcIndicator.js b/browser/base/content/webrtcIndicator.js index ddc03cec2c03..2d360fb2c39a 100644 --- a/browser/base/content/webrtcIndicator.js +++ b/browser/base/content/webrtcIndicator.js @@ -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/browser/base/content/webrtcLegacyIndicator.js b/browser/base/content/webrtcLegacyIndicator.js index 2a359a8a4c7f..c453233abaee 100644 --- a/browser/base/content/webrtcLegacyIndicator.js +++ b/browser/base/content/webrtcLegacyIndicator.js @@ -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 { webrtcUI } = ChromeUtils.import("resource:///modules/webrtcUI.jsm"); const BUNDLE_URL = "chrome://browser/locale/webrtcIndicator.properties"; diff --git a/browser/components/about/test/unit/test_getURIFlags.js b/browser/components/about/test/unit/test_getURIFlags.js index 87a18369b277..09846b812239 100644 --- a/browser/components/about/test/unit/test_getURIFlags.js +++ b/browser/components/about/test/unit/test_getURIFlags.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const contract = "@mozilla.org/network/protocol/about;1?what=newtab"; const am = Cc[contract].getService(Ci.nsIAboutModule); const uri = Services.io.newURI("about:newtab"); diff --git a/browser/components/aboutlogins/tests/unit/test_getPotentialBreachesByLoginGUID.js b/browser/components/aboutlogins/tests/unit/test_getPotentialBreachesByLoginGUID.js index a725fe9e1ee1..624958d3cc42 100644 --- a/browser/components/aboutlogins/tests/unit/test_getPotentialBreachesByLoginGUID.js +++ b/browser/components/aboutlogins/tests/unit/test_getPotentialBreachesByLoginGUID.js @@ -7,7 +7,6 @@ const { RemoteSettings } = ChromeUtils.import( "resource://services-settings/remote-settings.js" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); // Initializing BrowserGlue requires a profile on Windows. do_get_profile(); diff --git a/browser/components/attribution/test/xpcshell/test_AttributionCode.js b/browser/components/attribution/test/xpcshell/test_AttributionCode.js index 4b9331fd5484..43be3306b475 100644 --- a/browser/components/attribution/test/xpcshell/test_AttributionCode.js +++ b/browser/components/attribution/test/xpcshell/test_AttributionCode.js @@ -6,7 +6,6 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); add_task(async () => { await setupStubs(); diff --git a/browser/components/distribution.js b/browser/components/distribution.js index 724ccb9b036c..5bce5bbbaaa0 100644 --- a/browser/components/distribution.js +++ b/browser/components/distribution.js @@ -13,7 +13,6 @@ const PREF_CACHED_FILE_APPVERSION = "distribution.iniFile.exists.appversion"; 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/doh/test/unit/head.js b/browser/components/doh/test/unit/head.js index a4f2cf5a952e..33ce7b703710 100644 --- a/browser/components/doh/test/unit/head.js +++ b/browser/components/doh/test/unit/head.js @@ -4,7 +4,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { PromiseUtils } = ChromeUtils.import( "resource://gre/modules/PromiseUtils.jsm" diff --git a/browser/components/downloads/content/allDownloadsView.js b/browser/components/downloads/content/allDownloadsView.js index 502faf4bb33a..df375073a559 100644 --- a/browser/components/downloads/content/allDownloadsView.js +++ b/browser/components/downloads/content/allDownloadsView.js @@ -6,7 +6,6 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", diff --git a/browser/components/downloads/content/downloads.js b/browser/components/downloads/content/downloads.js index f7ddc4e55fbe..45f41214c28a 100644 --- a/browser/components/downloads/content/downloads.js +++ b/browser/components/downloads/content/downloads.js @@ -34,7 +34,6 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.defineModuleGetter( this, diff --git a/browser/components/downloads/test/unit/head.js b/browser/components/downloads/test/unit/head.js index c34ca78678b6..19d9d66e19ce 100644 --- a/browser/components/downloads/test/unit/head.js +++ b/browser/components/downloads/test/unit/head.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - ChromeUtils.defineModuleGetter( this, "Downloads", diff --git a/browser/components/enterprisepolicies/content/aboutPolicies.js b/browser/components/enterprisepolicies/content/aboutPolicies.js index 4b5def9ad5ef..72227adb1f4c 100644 --- a/browser/components/enterprisepolicies/content/aboutPolicies.js +++ b/browser/components/enterprisepolicies/content/aboutPolicies.js @@ -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/enterprisepolicies/tests/xpcshell/head.js b/browser/components/enterprisepolicies/tests/xpcshell/head.js index c03a5b68ea32..9ed4e2db0ffb 100644 --- a/browser/components/enterprisepolicies/tests/xpcshell/head.js +++ b/browser/components/enterprisepolicies/tests/xpcshell/head.js @@ -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/browser/components/extensions/child/ext-menus.js b/browser/components/extensions/child/ext-menus.js index 8e5e36dca628..8a61df0a83d1 100644 --- a/browser/components/extensions/child/ext-menus.js +++ b/browser/components/extensions/child/ext-menus.js @@ -6,8 +6,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var { withHandlingUserInput } = ExtensionCommon; var { ExtensionError } = ExtensionUtils; diff --git a/browser/components/extensions/test/xpcshell/head.js b/browser/components/extensions/test/xpcshell/head.js index 3e54d11d4a58..715ef7cd3e92 100644 --- a/browser/components/extensions/test/xpcshell/head.js +++ b/browser/components/extensions/test/xpcshell/head.js @@ -2,7 +2,6 @@ /* exported createHttpServer, promiseConsoleOutput, assertPersistentListeners */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/browser/components/firefoxview/recently-closed-tabs.mjs b/browser/components/firefoxview/recently-closed-tabs.mjs index 49103d10372b..5f0d3dad7d9d 100644 --- a/browser/components/firefoxview/recently-closed-tabs.mjs +++ b/browser/components/firefoxview/recently-closed-tabs.mjs @@ -4,7 +4,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const lazy = {}; ChromeUtils.defineModuleGetter( lazy, diff --git a/browser/components/installerprefs/test/unit/head.js b/browser/components/installerprefs/test/unit/head.js index 5d058ab5e0af..108e77c17894 100644 --- a/browser/components/installerprefs/test/unit/head.js +++ b/browser/components/installerprefs/test/unit/head.js @@ -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"); - const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); diff --git a/browser/components/ion/content/ion.js b/browser/components/ion/content/ion.js index ef230998a064..67e915b45a2b 100644 --- a/browser/components/ion/content/ion.js +++ b/browser/components/ion/content/ion.js @@ -23,8 +23,6 @@ const { TelemetryController } = ChromeUtils.import( "resource://gre/modules/TelemetryController.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - let parserUtils = Cc["@mozilla.org/parserutils;1"].getService( Ci.nsIParserUtils ); diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js index 32ceb09dcb66..98bf12fa165b 100644 --- a/browser/components/migration/content/migration.js +++ b/browser/components/migration/content/migration.js @@ -7,7 +7,6 @@ const kIMig = Ci.nsIBrowserProfileMigrator; const kIPStartup = Ci.nsIProfileStartup; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); diff --git a/browser/components/migration/tests/unit/head_migration.js b/browser/components/migration/tests/unit/head_migration.js index 49edabbffcf4..60a9017ffde8 100644 --- a/browser/components/migration/tests/unit/head_migration.js +++ b/browser/components/migration/tests/unit/head_migration.js @@ -16,7 +16,6 @@ var { Preferences } = ChromeUtils.import( var { PromiseUtils } = ChromeUtils.import( "resource://gre/modules/PromiseUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/browser/components/newtab/test/xpcshell/head.js b/browser/components/newtab/test/xpcshell/head.js index d0e7cc6529cb..a6780866e667 100644 --- a/browser/components/newtab/test/xpcshell/head.js +++ b/browser/components/newtab/test/xpcshell/head.js @@ -5,7 +5,6 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ /* eslint-disable no-unused-vars */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/browser/components/pagedata/tests/unit/head.js b/browser/components/pagedata/tests/unit/head.js index 6156e2c138d3..1bac83170481 100644 --- a/browser/components/pagedata/tests/unit/head.js +++ b/browser/components/pagedata/tests/unit/head.js @@ -4,7 +4,6 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { PageDataSchema: "resource:///modules/pagedata/PageDataSchema.jsm", diff --git a/browser/components/places/content/bookmarkProperties.js b/browser/components/places/content/bookmarkProperties.js index 90799668535c..e9442b9b78e0 100644 --- a/browser/components/places/content/bookmarkProperties.js +++ b/browser/components/places/content/bookmarkProperties.js @@ -54,7 +54,6 @@ /* import-globals-from controller.js */ /* Shared Places Import - change other consumers if you change this: */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/browser/components/places/content/bookmarksSidebar.js b/browser/components/places/content/bookmarksSidebar.js index 8f096f59a31c..3ddc955dbab3 100644 --- a/browser/components/places/content/bookmarksSidebar.js +++ b/browser/components/places/content/bookmarksSidebar.js @@ -4,7 +4,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /* Shared Places Import - change other consumers if you change this: */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/browser/components/places/content/editBookmark.js b/browser/components/places/content/editBookmark.js index 6c2cfaa4e815..3f3142108fde 100644 --- a/browser/components/places/content/editBookmark.js +++ b/browser/components/places/content/editBookmark.js @@ -13,8 +13,6 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - XPCOMUtils.defineLazyModuleGetters(this, { CustomizableUI: "resource:///modules/CustomizableUI.jsm", PlacesUtils: "resource://gre/modules/PlacesUtils.jsm", diff --git a/browser/components/places/content/historySidebar.js b/browser/components/places/content/historySidebar.js index 709603015572..d063e34862b8 100644 --- a/browser/components/places/content/historySidebar.js +++ b/browser/components/places/content/historySidebar.js @@ -4,7 +4,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /* Shared Places Import - change other consumers if you change this: */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/browser/components/places/content/instantEditBookmark.js b/browser/components/places/content/instantEditBookmark.js index 5cd5a14d0732..a0f0ba81adcd 100644 --- a/browser/components/places/content/instantEditBookmark.js +++ b/browser/components/places/content/instantEditBookmark.js @@ -12,8 +12,6 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - XPCOMUtils.defineLazyModuleGetters(this, { CustomizableUI: "resource:///modules/CustomizableUI.jsm", PlacesUtils: "resource://gre/modules/PlacesUtils.jsm", diff --git a/browser/components/places/content/places.js b/browser/components/places/content/places.js index 3ea70302064e..51551bf6cfb8 100644 --- a/browser/components/places/content/places.js +++ b/browser/components/places/content/places.js @@ -8,7 +8,6 @@ /* import-globals-from /browser/components/downloads/content/allDownloadsView.js */ /* Shared Places Import - change other consumers if you change this: */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/browser/components/places/content/treeView.js b/browser/components/places/content/treeView.js index 926fbb679747..0a97760e4adb 100644 --- a/browser/components/places/content/treeView.js +++ b/browser/components/places/content/treeView.js @@ -4,8 +4,6 @@ /* import-globals-from controller.js */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - /** * This returns the key for any node/details object. * diff --git a/browser/components/places/metadataViewer/interactionsViewer.js b/browser/components/places/metadataViewer/interactionsViewer.js index eb6fa7057f7f..13c9202be9ed 100644 --- a/browser/components/places/metadataViewer/interactionsViewer.js +++ b/browser/components/places/metadataViewer/interactionsViewer.js @@ -7,7 +7,6 @@ const { Interactions } = ChromeUtils.import( "resource:///modules/Interactions.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { Snapshots } = ChromeUtils.import("resource:///modules/Snapshots.jsm"); const { PlacesUtils } = ChromeUtils.import( "resource://gre/modules/PlacesUtils.jsm" diff --git a/browser/components/places/tests/chrome/head.js b/browser/components/places/tests/chrome/head.js index 44af9d3334fa..53b2afc6255d 100644 --- a/browser/components/places/tests/chrome/head.js +++ b/browser/components/places/tests/chrome/head.js @@ -1,7 +1,6 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); Services.scriptloader.loadSubScript( "chrome://global/content/globalOverlay.js", this diff --git a/browser/components/places/tests/unit/head_bookmarks.js b/browser/components/places/tests/unit/head_bookmarks.js index 3a4d8e1fb5bf..0c3f3bfbacfd 100644 --- a/browser/components/places/tests/unit/head_bookmarks.js +++ b/browser/components/places/tests/unit/head_bookmarks.js @@ -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/. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // Import common head. /* import-globals-from ../../../../../toolkit/components/places/tests/head_common.js */ var commonFile = do_get_file( diff --git a/browser/components/places/tests/unit/interactions/head_interactions.js b/browser/components/places/tests/unit/interactions/head_interactions.js index 2bcea41b6bd5..0fda6373c678 100644 --- a/browser/components/places/tests/unit/interactions/head_interactions.js +++ b/browser/components/places/tests/unit/interactions/head_interactions.js @@ -5,7 +5,6 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { Interactions: "resource:///modules/Interactions.jsm", diff --git a/browser/components/preferences/dialogs/blocklists.js b/browser/components/preferences/dialogs/blocklists.js index bbf6a5f4c2e5..c28ee09f9696 100644 --- a/browser/components/preferences/dialogs/blocklists.js +++ b/browser/components/preferences/dialogs/blocklists.js @@ -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/. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const BASE_LIST_ID = "base"; const CONTENT_LIST_ID = "content"; const TRACK_SUFFIX = "-track-digest256"; diff --git a/browser/components/preferences/dialogs/browserLanguages.js b/browser/components/preferences/dialogs/browserLanguages.js index fff819f9306c..9937907e2076 100644 --- a/browser/components/preferences/dialogs/browserLanguages.js +++ b/browser/components/preferences/dialogs/browserLanguages.js @@ -4,8 +4,6 @@ /* import-globals-from /toolkit/content/preferencesBindings.js */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // This is exported by preferences.js but we can't import that in a subdialog. let { LangPackMatcher } = window.top; diff --git a/browser/components/preferences/dialogs/languages.js b/browser/components/preferences/dialogs/languages.js index 00ff74e4c360..cf5f4a986040 100644 --- a/browser/components/preferences/dialogs/languages.js +++ b/browser/components/preferences/dialogs/languages.js @@ -5,8 +5,6 @@ /* import-globals-from /toolkit/content/preferencesBindings.js */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - document .getElementById("LanguagesDialog") .addEventListener("dialoghelp", window.top.openPrefsHelp); diff --git a/browser/components/preferences/dialogs/permissions.js b/browser/components/preferences/dialogs/permissions.js index 84a6147be60c..bbab64e57061 100644 --- a/browser/components/preferences/dialogs/permissions.js +++ b/browser/components/preferences/dialogs/permissions.js @@ -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/. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); diff --git a/browser/components/preferences/dialogs/selectBookmark.js b/browser/components/preferences/dialogs/selectBookmark.js index e841df9c128f..92eda1004384 100644 --- a/browser/components/preferences/dialogs/selectBookmark.js +++ b/browser/components/preferences/dialogs/selectBookmark.js @@ -4,7 +4,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /* Shared Places Import - change other consumers if you change this: */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/browser/components/preferences/dialogs/siteDataSettings.js b/browser/components/preferences/dialogs/siteDataSettings.js index 16e7c012e0e2..2b512156486c 100644 --- a/browser/components/preferences/dialogs/siteDataSettings.js +++ b/browser/components/preferences/dialogs/siteDataSettings.js @@ -8,7 +8,6 @@ var { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.defineModuleGetter( this, diff --git a/browser/components/preferences/dialogs/sitePermissions.js b/browser/components/preferences/dialogs/sitePermissions.js index 019ca0510ac4..8c684f6f501a 100644 --- a/browser/components/preferences/dialogs/sitePermissions.js +++ b/browser/components/preferences/dialogs/sitePermissions.js @@ -4,7 +4,6 @@ /* import-globals-from ../extensionControlled.js */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); diff --git a/browser/components/preferences/dialogs/syncChooseWhatToSync.js b/browser/components/preferences/dialogs/syncChooseWhatToSync.js index 3401c91d4613..d1f468233a34 100644 --- a/browser/components/preferences/dialogs/syncChooseWhatToSync.js +++ b/browser/components/preferences/dialogs/syncChooseWhatToSync.js @@ -4,8 +4,6 @@ /* import-globals-from /toolkit/content/preferencesBindings.js */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - Preferences.addAll([ { id: "services.sync.engine.addons", type: "bool" }, { id: "services.sync.engine.bookmarks", type: "bool" }, diff --git a/browser/components/preferences/dialogs/translation.js b/browser/components/preferences/dialogs/translation.js index ca881143bb3d..1b94f3a3dd23 100644 --- a/browser/components/preferences/dialogs/translation.js +++ b/browser/components/preferences/dialogs/translation.js @@ -5,8 +5,6 @@ "use strict"; -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const kPermissionType = "translate"; const kLanguagesPref = "browser.translation.neverForLanguages"; diff --git a/browser/components/preferences/fxaPairDevice.js b/browser/components/preferences/fxaPairDevice.js index 29002e634ded..51b16c0135d0 100644 --- a/browser/components/preferences/fxaPairDevice.js +++ b/browser/components/preferences/fxaPairDevice.js @@ -5,7 +5,6 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { FxAccounts } = ChromeUtils.import( "resource://gre/modules/FxAccounts.jsm" ); diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js index d3a1fce03d4f..f55c0d36d8ee 100644 --- a/browser/components/preferences/preferences.js +++ b/browser/components/preferences/preferences.js @@ -20,7 +20,6 @@ var { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { Downloads } = ChromeUtils.import("resource://gre/modules/Downloads.jsm"); var { Integration } = ChromeUtils.import( diff --git a/browser/components/preferences/tests/browser_browser_languages_subdialog.js b/browser/components/preferences/tests/browser_browser_languages_subdialog.js index a204f697f904..2747cd166882 100644 --- a/browser/components/preferences/tests/browser_browser_languages_subdialog.js +++ b/browser/components/preferences/tests/browser_browser_languages_subdialog.js @@ -4,7 +4,6 @@ const { AddonTestUtils } = ChromeUtils.import( "resource://testing-common/AddonTestUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); AddonTestUtils.initMochitest(this); diff --git a/browser/components/preferences/tests/browser_connection.js b/browser/components/preferences/tests/browser_connection.js index b7a2a2303e67..05f04ccc5271 100644 --- a/browser/components/preferences/tests/browser_connection.js +++ b/browser/components/preferences/tests/browser_connection.js @@ -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/. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function test() { waitForExplicitFinish(); diff --git a/browser/components/preferences/tests/browser_connection_bug388287.js b/browser/components/preferences/tests/browser_connection_bug388287.js index d70a9ed9dbde..81159503de8b 100644 --- a/browser/components/preferences/tests/browser_connection_bug388287.js +++ b/browser/components/preferences/tests/browser_connection_bug388287.js @@ -2,8 +2,6 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function test() { waitForExplicitFinish(); const connectionURL = diff --git a/browser/components/preferences/tests/browser_connection_dnsoverhttps.js b/browser/components/preferences/tests/browser_connection_dnsoverhttps.js index 62bd8acea4a9..75eb2cbe7bcf 100644 --- a/browser/components/preferences/tests/browser_connection_dnsoverhttps.js +++ b/browser/components/preferences/tests/browser_connection_dnsoverhttps.js @@ -5,7 +5,6 @@ requestLongerTimeout(4); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { EnterprisePolicyTesting, PoliciesPrefTracker } = ChromeUtils.import( "resource://testing-common/EnterprisePolicyTesting.jsm" ); diff --git a/browser/components/preferences/tests/browser_permissions_dialog.js b/browser/components/preferences/tests/browser_permissions_dialog.js index b89b3d770718..9ea4bf8564a1 100644 --- a/browser/components/preferences/tests/browser_permissions_dialog.js +++ b/browser/components/preferences/tests/browser_permissions_dialog.js @@ -8,8 +8,6 @@ var { SitePermissions } = ChromeUtils.import( "resource:///modules/SitePermissions.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const PERMISSIONS_URL = "chrome://browser/content/preferences/dialogs/sitePermissions.xhtml"; const URL = "http://www.example.com"; diff --git a/browser/components/preferences/tests/browser_proxy_backup.js b/browser/components/preferences/tests/browser_proxy_backup.js index 7b138666425b..6d22e24ff6e0 100644 --- a/browser/components/preferences/tests/browser_proxy_backup.js +++ b/browser/components/preferences/tests/browser_proxy_backup.js @@ -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/. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function test() { waitForExplicitFinish(); diff --git a/browser/components/privatebrowsing/test/browser/head.js b/browser/components/privatebrowsing/test/browser/head.js index fe4ee20fad4e..4b934ed87eeb 100644 --- a/browser/components/privatebrowsing/test/browser/head.js +++ b/browser/components/privatebrowsing/test/browser/head.js @@ -4,7 +4,6 @@ var { PromiseUtils } = ChromeUtils.import( "resource://gre/modules/PromiseUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.defineModuleGetter( this, "PlacesUtils", diff --git a/browser/components/screenshots/content/screenshots.js b/browser/components/screenshots/content/screenshots.js index 69ab5048ab61..72748ac15924 100644 --- a/browser/components/screenshots/content/screenshots.js +++ b/browser/components/screenshots/content/screenshots.js @@ -9,8 +9,6 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - XPCOMUtils.defineLazyModuleGetters(this, { Downloads: "resource://gre/modules/Downloads.jsm", FileUtils: "resource://gre/modules/FileUtils.jsm", diff --git a/browser/components/search/test/unit/test_urlTelemetry.js b/browser/components/search/test/unit/test_urlTelemetry.js index dfcb209ac88a..2d7b60eb6f79 100644 --- a/browser/components/search/test/unit/test_urlTelemetry.js +++ b/browser/components/search/test/unit/test_urlTelemetry.js @@ -4,7 +4,6 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.jsm", diff --git a/browser/components/search/test/unit/test_urlTelemetry_generic.js b/browser/components/search/test/unit/test_urlTelemetry_generic.js index ae737db69e07..09b3084e8a73 100644 --- a/browser/components/search/test/unit/test_urlTelemetry_generic.js +++ b/browser/components/search/test/unit/test_urlTelemetry_generic.js @@ -4,7 +4,6 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.jsm", diff --git a/browser/components/sessionstore/content/aboutSessionRestore.js b/browser/components/sessionstore/content/aboutSessionRestore.js index f234a8173e1b..99450094a8da 100644 --- a/browser/components/sessionstore/content/aboutSessionRestore.js +++ b/browser/components/sessionstore/content/aboutSessionRestore.js @@ -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/browser/components/sessionstore/test/unit/head.js b/browser/components/sessionstore/test/unit/head.js index 18a324add507..d7f33990e77e 100644 --- a/browser/components/sessionstore/test/unit/head.js +++ b/browser/components/sessionstore/test/unit/head.js @@ -1,5 +1,3 @@ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - ChromeUtils.defineModuleGetter( this, "SessionStartup", diff --git a/browser/components/syncedtabs/SyncedTabsDeckComponent.js b/browser/components/syncedtabs/SyncedTabsDeckComponent.js index 093e65be35f2..1df54677d5d2 100644 --- a/browser/components/syncedtabs/SyncedTabsDeckComponent.js +++ b/browser/components/syncedtabs/SyncedTabsDeckComponent.js @@ -7,7 +7,6 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { SyncedTabsDeckStore } = ChromeUtils.import( "resource:///modules/syncedtabs/SyncedTabsDeckStore.js" diff --git a/browser/components/syncedtabs/TabListComponent.js b/browser/components/syncedtabs/TabListComponent.js index 4be0a9bfcd0b..d244aa78955a 100644 --- a/browser/components/syncedtabs/TabListComponent.js +++ b/browser/components/syncedtabs/TabListComponent.js @@ -7,7 +7,6 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); let log = ChromeUtils.import( "resource://gre/modules/Log.jsm" diff --git a/browser/components/syncedtabs/TabListView.js b/browser/components/syncedtabs/TabListView.js index 364de5860205..f157af57ddf0 100644 --- a/browser/components/syncedtabs/TabListView.js +++ b/browser/components/syncedtabs/TabListView.js @@ -4,8 +4,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const lazy = {}; ChromeUtils.defineModuleGetter( diff --git a/browser/components/syncedtabs/test/browser/head.js b/browser/components/syncedtabs/test/browser/head.js index 74a207e12eb1..72fa452cac19 100644 --- a/browser/components/syncedtabs/test/browser/head.js +++ b/browser/components/syncedtabs/test/browser/head.js @@ -1,5 +1,4 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm"); diff --git a/browser/components/syncedtabs/test/xpcshell/head.js b/browser/components/syncedtabs/test/xpcshell/head.js index 83d29de9549c..d5e138222a9f 100644 --- a/browser/components/syncedtabs/test/xpcshell/head.js +++ b/browser/components/syncedtabs/test/xpcshell/head.js @@ -1,7 +1,6 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm"); XPCOMUtils.defineLazyGetter(this, "FxAccountsCommon", function() { diff --git a/browser/components/tests/unit/head.js b/browser/components/tests/unit/head.js index 5ad9d5e7b6a1..9bd9f7d41493 100644 --- a/browser/components/tests/unit/head.js +++ b/browser/components/tests/unit/head.js @@ -2,6 +2,5 @@ * 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/. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm"); var gProfD = do_get_profile().QueryInterface(Ci.nsIFile); diff --git a/browser/components/urlbar/tests/unit/head.js b/browser/components/urlbar/tests/unit/head.js index 446b95429306..1f2ad5ecf5d9 100644 --- a/browser/components/urlbar/tests/unit/head.js +++ b/browser/components/urlbar/tests/unit/head.js @@ -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/browser/extensions/formautofill/content/editDialog.js b/browser/extensions/formautofill/content/editDialog.js index 2276e7f1894b..700791188f37 100644 --- a/browser/extensions/formautofill/content/editDialog.js +++ b/browser/extensions/formautofill/content/editDialog.js @@ -11,7 +11,6 @@ const { FormAutofill } = ChromeUtils.import( "resource://autofill/FormAutofill.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.defineModuleGetter( this, diff --git a/browser/extensions/formautofill/content/manageDialog.js b/browser/extensions/formautofill/content/manageDialog.js index 35981a43f2bc..8403514f375b 100644 --- a/browser/extensions/formautofill/content/manageDialog.js +++ b/browser/extensions/formautofill/content/manageDialog.js @@ -13,7 +13,6 @@ const EDIT_CREDIT_CARD_URL = 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/extensions/formautofill/test/mochitest/formautofill_parent_utils.js b/browser/extensions/formautofill/test/mochitest/formautofill_parent_utils.js index 90b899a8f9c0..2f0d5e7a9a38 100644 --- a/browser/extensions/formautofill/test/mochitest/formautofill_parent_utils.js +++ b/browser/extensions/formautofill/test/mochitest/formautofill_parent_utils.js @@ -4,7 +4,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { FormAutofill } = ChromeUtils.import( "resource://autofill/FormAutofill.jsm" ); diff --git a/browser/extensions/formautofill/test/unit/head.js b/browser/extensions/formautofill/test/unit/head.js index 5d2526991322..cc04c016fa33 100644 --- a/browser/extensions/formautofill/test/unit/head.js +++ b/browser/extensions/formautofill/test/unit/head.js @@ -7,7 +7,6 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { ObjectUtils } = ChromeUtils.import( "resource://gre/modules/ObjectUtils.jsm" ); diff --git a/browser/extensions/webcompat/about-compat/aboutPage.js b/browser/extensions/webcompat/about-compat/aboutPage.js index 97d6302543aa..f639242e0dc5 100644 --- a/browser/extensions/webcompat/about-compat/aboutPage.js +++ b/browser/extensions/webcompat/about-compat/aboutPage.js @@ -6,8 +6,6 @@ /* global ExtensionAPI, XPCOMUtils */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - XPCOMUtils.defineLazyServiceGetter( this, "resProto", diff --git a/browser/fxr/content/fxrui.js b/browser/fxr/content/fxrui.js index 24d016f4db26..3ea808f2366c 100644 --- a/browser/fxr/content/fxrui.js +++ b/browser/fxr/content/fxrui.js @@ -31,7 +31,6 @@ let forwardButton = null; let refreshButton = null; let stopButton = null; -let { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { PrivateBrowsingUtils } = ChromeUtils.import( "resource://gre/modules/PrivateBrowsingUtils.jsm" ); diff --git a/browser/fxr/content/prefs.js b/browser/fxr/content/prefs.js index fa00066dafea..8f23da3f364d 100644 --- a/browser/fxr/content/prefs.js +++ b/browser/fxr/content/prefs.js @@ -5,8 +5,6 @@ /* import-globals-from common.js */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); diff --git a/browser/modules/test/unit/test_E10SUtils_nested_URIs.js b/browser/modules/test/unit/test_E10SUtils_nested_URIs.js index b44739de0333..cc7447684dd8 100644 --- a/browser/modules/test/unit/test_E10SUtils_nested_URIs.js +++ b/browser/modules/test/unit/test_E10SUtils_nested_URIs.js @@ -4,7 +4,6 @@ const { E10SUtils } = ChromeUtils.import( "resource://gre/modules/E10SUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var TEST_PREFERRED_REMOTE_TYPES = [ E10SUtils.WEB_REMOTE_TYPE, diff --git a/browser/modules/test/unit/test_HomePage.js b/browser/modules/test/unit/test_HomePage.js index f312482ca458..75e783a49571 100644 --- a/browser/modules/test/unit/test_HomePage.js +++ b/browser/modules/test/unit/test_HomePage.js @@ -7,7 +7,6 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { HomePage: "resource:///modules/HomePage.jsm", diff --git a/browser/modules/test/unit/test_HomePage_ignore.js b/browser/modules/test/unit/test_HomePage_ignore.js index c1a6b4f9e9e3..4c4e2c84f206 100644 --- a/browser/modules/test/unit/test_HomePage_ignore.js +++ b/browser/modules/test/unit/test_HomePage_ignore.js @@ -7,7 +7,6 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { HomePage: "resource:///modules/HomePage.jsm", diff --git a/browser/modules/test/unit/test_InstallationTelemetry.js b/browser/modules/test/unit/test_InstallationTelemetry.js index 61fab3596c62..09f4e5fa4b00 100644 --- a/browser/modules/test/unit/test_InstallationTelemetry.js +++ b/browser/modules/test/unit/test_InstallationTelemetry.js @@ -9,7 +9,6 @@ const { AppConstants } = ChromeUtils.import( const { BrowserUsageTelemetry } = ChromeUtils.import( "resource:///modules/BrowserUsageTelemetry.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { TelemetryTestUtils } = ChromeUtils.import( "resource://testing-common/TelemetryTestUtils.jsm" ); diff --git a/browser/modules/test/unit/test_LaterRun.js b/browser/modules/test/unit/test_LaterRun.js index 580d6945ebf4..dd923cc9ced9 100644 --- a/browser/modules/test/unit/test_LaterRun.js +++ b/browser/modules/test/unit/test_LaterRun.js @@ -5,7 +5,6 @@ const kPagePrefRoot = "browser.laterrun.pages."; const kSessionCountPref = "browser.laterrun.bookkeeping.sessionCount"; const kProfileCreationTime = "browser.laterrun.bookkeeping.profileCreationTime"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { LaterRun } = ChromeUtils.import("resource:///modules/LaterRun.jsm"); Services.prefs.setBoolPref(kEnabledPref, true); diff --git a/browser/modules/test/unit/test_PingCentre.js b/browser/modules/test/unit/test_PingCentre.js index 333e776dfae1..311bd387f250 100644 --- a/browser/modules/test/unit/test_PingCentre.js +++ b/browser/modules/test/unit/test_PingCentre.js @@ -4,7 +4,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { PingCentre, PingCentreConstants } = ChromeUtils.import( "resource:///modules/PingCentre.jsm" ); diff --git a/browser/modules/test/unit/test_ProfileCounter.js b/browser/modules/test/unit/test_ProfileCounter.js index a2a3a96e5ff1..2dfd7d4c60a7 100644 --- a/browser/modules/test/unit/test_ProfileCounter.js +++ b/browser/modules/test/unit/test_ProfileCounter.js @@ -6,7 +6,6 @@ const { BrowserUsageTelemetry } = ChromeUtils.import( "resource:///modules/BrowserUsageTelemetry.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { TelemetryTestUtils } = ChromeUtils.import( "resource://testing-common/TelemetryTestUtils.jsm" ); diff --git a/browser/modules/test/unit/test_Sanitizer_interrupted.js b/browser/modules/test/unit/test_Sanitizer_interrupted.js index fd80a3af77e6..0210f867f5f8 100644 --- a/browser/modules/test/unit/test_Sanitizer_interrupted.js +++ b/browser/modules/test/unit/test_Sanitizer_interrupted.js @@ -3,8 +3,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - do_get_profile(); // Test that interrupted sanitizations are properly tracked. diff --git a/browser/modules/test/unit/test_SiteDataManager.js b/browser/modules/test/unit/test_SiteDataManager.js index d32c2f8146dc..1657d089ddb9 100644 --- a/browser/modules/test/unit/test_SiteDataManager.js +++ b/browser/modules/test/unit/test_SiteDataManager.js @@ -3,7 +3,6 @@ */ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { SiteDataManager } = ChromeUtils.import( "resource:///modules/SiteDataManager.jsm" ); diff --git a/browser/modules/test/unit/test_SiteDataManagerContainers.js b/browser/modules/test/unit/test_SiteDataManagerContainers.js index 6bd99ad89963..96cf2f09dedc 100644 --- a/browser/modules/test/unit/test_SiteDataManagerContainers.js +++ b/browser/modules/test/unit/test_SiteDataManagerContainers.js @@ -3,7 +3,6 @@ */ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { SiteDataManager } = ChromeUtils.import( "resource:///modules/SiteDataManager.jsm" ); diff --git a/browser/modules/test/unit/test_SitePermissions.js b/browser/modules/test/unit/test_SitePermissions.js index 0e9c1a66f4ca..bd47dc9cfead 100644 --- a/browser/modules/test/unit/test_SitePermissions.js +++ b/browser/modules/test/unit/test_SitePermissions.js @@ -6,7 +6,6 @@ const { SitePermissions } = ChromeUtils.import( "resource:///modules/SitePermissions.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const RESIST_FINGERPRINTING_ENABLED = Services.prefs.getBoolPref( "privacy.resistFingerprinting" diff --git a/browser/modules/test/unit/test_SitePermissions_temporary.js b/browser/modules/test/unit/test_SitePermissions_temporary.js index fa766272c1aa..195d890e90fb 100644 --- a/browser/modules/test/unit/test_SitePermissions_temporary.js +++ b/browser/modules/test/unit/test_SitePermissions_temporary.js @@ -6,7 +6,6 @@ const { SitePermissions } = ChromeUtils.import( "resource:///modules/SitePermissions.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const TemporaryPermissions = SitePermissions._temporaryPermissions; diff --git a/browser/modules/test/unit/test_discovery.js b/browser/modules/test/unit/test_discovery.js index 0bc1fe25b690..6b4bc41122bb 100644 --- a/browser/modules/test/unit/test_discovery.js +++ b/browser/modules/test/unit/test_discovery.js @@ -8,7 +8,6 @@ // ClientID fails without... do_get_profile(); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { TestUtils } = ChromeUtils.import( "resource://testing-common/TestUtils.jsm" ); diff --git a/caps/tests/unit/test_ipv6_host_literal.js b/caps/tests/unit/test_ipv6_host_literal.js index 0539e17de5c9..cde7d82d7ebb 100644 --- a/caps/tests/unit/test_ipv6_host_literal.js +++ b/caps/tests/unit/test_ipv6_host_literal.js @@ -1,4 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var ssm = Services.scriptSecurityManager; function makeURI(uri) { return Services.io.newURI(uri); diff --git a/caps/tests/unit/test_origin.js b/caps/tests/unit/test_origin.js index 8407020cba0f..6ab8f4da78e2 100644 --- a/caps/tests/unit/test_origin.js +++ b/caps/tests/unit/test_origin.js @@ -1,4 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var ssm = Services.scriptSecurityManager; function makeURI(uri) { return Services.io.newURI(uri); diff --git a/caps/tests/unit/test_precursor_principal.js b/caps/tests/unit/test_precursor_principal.js index 3b7dd9b73724..f69057dd0d0e 100644 --- a/caps/tests/unit/test_precursor_principal.js +++ b/caps/tests/unit/test_precursor_principal.js @@ -1,5 +1,4 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { TestUtils } = ChromeUtils.import( "resource://testing-common/TestUtils.jsm" ); diff --git a/caps/tests/unit/test_site_origin.js b/caps/tests/unit/test_site_origin.js index 7d97cc5050ad..bbde787f005a 100644 --- a/caps/tests/unit/test_site_origin.js +++ b/caps/tests/unit/test_site_origin.js @@ -1,4 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const scriptSecMan = Services.scriptSecurityManager; // SystemPrincipal checks diff --git a/caps/tests/unit/test_uri_escaping.js b/caps/tests/unit/test_uri_escaping.js index 91263b058cad..7feb58129557 100644 --- a/caps/tests/unit/test_uri_escaping.js +++ b/caps/tests/unit/test_uri_escaping.js @@ -1,4 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var ssm = Services.scriptSecurityManager; function makeURI(uri) { diff --git a/chrome/test/unit/head_crtestutils.js b/chrome/test/unit/head_crtestutils.js index e2c95672226e..d20486c385ba 100644 --- a/chrome/test/unit/head_crtestutils.js +++ b/chrome/test/unit/head_crtestutils.js @@ -1,8 +1,6 @@ const XULAPPINFO_CONTRACTID = "@mozilla.org/xre/app-info;1"; const XULAPPINFO_CID = Components.ID("{4ba645d3-be6f-40d6-a42a-01b2f40091b8}"); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function registerManifests(manifests) { var reg = Components.manager.QueryInterface(Ci.nsIComponentRegistrar); for (var manifest of manifests) { diff --git a/devtools/client/performance-new/popup/background.jsm.js b/devtools/client/performance-new/popup/background.jsm.js index a54b528ea26d..53e1c5d5deb4 100644 --- a/devtools/client/performance-new/popup/background.jsm.js +++ b/devtools/client/performance-new/popup/background.jsm.js @@ -13,7 +13,6 @@ // The following are not lazily loaded as they are needed during initialization. -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { createLazyLoaders } = ChromeUtils.import( "resource://devtools/client/performance-new/typescript-lazy-load.jsm.js" ); diff --git a/devtools/client/performance-new/test/xpcshell/head.js b/devtools/client/performance-new/test/xpcshell/head.js index 12236a5f8834..ab8b1349c932 100644 --- a/devtools/client/performance-new/test/xpcshell/head.js +++ b/devtools/client/performance-new/test/xpcshell/head.js @@ -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"); - registerCleanupFunction(() => { // Always clean up the prefs after every test. const { revertRecordingSettings } = ChromeUtils.import( diff --git a/devtools/platform/tests/xpcshell/test_nsjsinspector.js b/devtools/platform/tests/xpcshell/test_nsjsinspector.js index a5e63c0cdf69..74d18b7689cb 100644 --- a/devtools/platform/tests/xpcshell/test_nsjsinspector.js +++ b/devtools/platform/tests/xpcshell/test_nsjsinspector.js @@ -7,7 +7,6 @@ var gCount = 0; const MAX = 10; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var inspector = Cc["@mozilla.org/jsinspector;1"].getService(Ci.nsIJSInspector); // Emulate 10 simultaneously-debugged windows from 3 separate client connections. diff --git a/devtools/server/actors/webconsole/content-process-forward.js b/devtools/server/actors/webconsole/content-process-forward.js index d317947fedef..cffa9bc54ff8 100644 --- a/devtools/server/actors/webconsole/content-process-forward.js +++ b/devtools/server/actors/webconsole/content-process-forward.js @@ -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/devtools/server/startup/content-process-script.js b/devtools/server/startup/content-process-script.js index b086837e37dc..a13846e966b6 100644 --- a/devtools/server/startup/content-process-script.js +++ b/devtools/server/startup/content-process-script.js @@ -18,8 +18,6 @@ * Also, this module is only loaded, on-demand from process-helper if devtools are watching for process targets. */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const SHARED_DATA_KEY_NAME = "DevTools:watchedPerWatcher"; class ContentProcessStartup { diff --git a/devtools/server/startup/content-process.js b/devtools/server/startup/content-process.js index 859c7be31066..2e572d643914 100644 --- a/devtools/server/startup/content-process.js +++ b/devtools/server/startup/content-process.js @@ -14,8 +14,6 @@ * The actual server startup itself is in a JSM so that code can be cached. */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function onInit(message) { // Only reply if we are in a real content process if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) { diff --git a/devtools/shared/loader/base-loader.js b/devtools/shared/loader/base-loader.js index 82d82170ef13..1735539688de 100644 --- a/devtools/shared/loader/base-loader.js +++ b/devtools/shared/loader/base-loader.js @@ -11,7 +11,6 @@ this.EXPORTED_SYMBOLS = ["Loader", "resolveURI", "Module", "Require", "unload"]; const { Constructor: CC, manager: Cm } = Components; const systemPrincipal = CC("@mozilla.org/systemprincipal;1", "nsIPrincipal")(); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/devtools/startup/tests/xpcshell/test_devtools_shim.js b/devtools/startup/tests/xpcshell/test_devtools_shim.js index 4011a132f007..47f7ef254bf2 100644 --- a/devtools/startup/tests/xpcshell/test_devtools_shim.js +++ b/devtools/startup/tests/xpcshell/test_devtools_shim.js @@ -6,7 +6,6 @@ const { DevToolsShim } = ChromeUtils.import( "chrome://devtools-startup/content/DevToolsShim.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); // Test the DevToolsShim diff --git a/docshell/test/browser/browser_browsingContext-getWindowByName.js b/docshell/test/browser/browser_browsingContext-getWindowByName.js index aa41ee49e486..a51951dd2e99 100644 --- a/docshell/test/browser/browser_browsingContext-getWindowByName.js +++ b/docshell/test/browser/browser_browsingContext-getWindowByName.js @@ -2,7 +2,6 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ "use strict"; -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function addWindow(name) { var blank = Cc["@mozilla.org/supports-string;1"].createInstance( diff --git a/docshell/test/browser/browser_timelineMarkers-frame-04.js b/docshell/test/browser/browser_timelineMarkers-frame-04.js index 888f9f55d9f9..a05804c5b38c 100644 --- a/docshell/test/browser/browser_timelineMarkers-frame-04.js +++ b/docshell/test/browser/browser_timelineMarkers-frame-04.js @@ -6,8 +6,6 @@ "use strict"; -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // Test that the docShell profile timeline API returns the right // markers for XMLHttpRequest events. diff --git a/docshell/test/browser/browser_timelineMarkers-frame-05.js b/docshell/test/browser/browser_timelineMarkers-frame-05.js index 97bb7c24403c..b5c245e4517d 100644 --- a/docshell/test/browser/browser_timelineMarkers-frame-05.js +++ b/docshell/test/browser/browser_timelineMarkers-frame-05.js @@ -6,8 +6,6 @@ "use strict"; -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function forceSyncReflow(div) { div.setAttribute("class", "resize-change-color"); // Force a reflow. diff --git a/docshell/test/chrome/docshell_helpers.js b/docshell/test/chrome/docshell_helpers.js index b24bb48082e3..245c54bfcbb5 100644 --- a/docshell/test/chrome/docshell_helpers.js +++ b/docshell/test/chrome/docshell_helpers.js @@ -21,7 +21,6 @@ for (var name of imports) { const { BrowserTestUtils } = ChromeUtils.import( "resource://testing-common/BrowserTestUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const ACTOR_MODULE_URI = "chrome://mochitests/content/chrome/docshell/test/chrome/DocShellHelpers.jsm"; diff --git a/docshell/test/unit/head_docshell.js b/docshell/test/unit/head_docshell.js index da95698bdb33..07646665d39b 100644 --- a/docshell/test/unit/head_docshell.js +++ b/docshell/test/unit/head_docshell.js @@ -5,7 +5,6 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm", diff --git a/docshell/test/unit_ipc/test_pb_notification_ipc.js b/docshell/test/unit_ipc/test_pb_notification_ipc.js index 48cdfaa1bf99..ecb366a3e1be 100644 --- a/docshell/test/unit_ipc/test_pb_notification_ipc.js +++ b/docshell/test/unit_ipc/test_pb_notification_ipc.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function run_test() { var notifications = 0; var obs = { diff --git a/dom/base/test/unit/head_utilities.js b/dom/base/test/unit/head_utilities.js index 3c5b15609fa5..4b6d41ff1b33 100644 --- a/dom/base/test/unit/head_utilities.js +++ b/dom/base/test/unit/head_utilities.js @@ -31,7 +31,6 @@ var { HttpServer, } = ChromeUtils.import("resource://testing-common/httpd.js"); var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const nsIDocumentEncoder = Ci.nsIDocumentEncoder; const replacementChar = diff --git a/dom/browser-element/BrowserElementChild.js b/dom/browser-element/BrowserElementChild.js index 349f91f4ea55..762957bcd4f7 100644 --- a/dom/browser-element/BrowserElementChild.js +++ b/dom/browser-element/BrowserElementChild.js @@ -7,8 +7,6 @@ "use strict"; -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function debug(msg) { // dump("BrowserElementChild - " + msg + "\n"); } diff --git a/dom/browser-element/BrowserElementChildPreload.js b/dom/browser-element/BrowserElementChildPreload.js index 71687daa8f14..1bbcf9ff05de 100644 --- a/dom/browser-element/BrowserElementChildPreload.js +++ b/dom/browser-element/BrowserElementChildPreload.js @@ -14,7 +14,6 @@ debug("loaded"); var BrowserElementIsReady; -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { BrowserElementPromptService } = ChromeUtils.import( "resource://gre/modules/BrowserElementPromptService.jsm" ); diff --git a/dom/cache/test/xpcshell/head.js b/dom/cache/test/xpcshell/head.js index 1717a6d884a2..e639c865e924 100644 --- a/dom/cache/test/xpcshell/head.js +++ b/dom/cache/test/xpcshell/head.js @@ -9,8 +9,6 @@ // testSteps is expected to be defined by the file including this file. /* global testSteps */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const NS_APP_USER_PROFILE_50_DIR = "ProfD"; const osWindowsName = "WINNT"; const pathDelimiter = "/"; diff --git a/dom/cache/test/xpcshell/make_profile.js b/dom/cache/test/xpcshell/make_profile.js index 443a87707bd0..a54e85a09bb2 100644 --- a/dom/cache/test/xpcshell/make_profile.js +++ b/dom/cache/test/xpcshell/make_profile.js @@ -6,8 +6,6 @@ * and are CC licensed by https://www.flickr.com/photos/legofenris/. */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // Enumerate the directory tree and store results in entryList as // // { path: 'a/b/c', file: } diff --git a/dom/console/tests/xpcshell/test_basic.js b/dom/console/tests/xpcshell/test_basic.js index 2b4342a801b2..5d79c5c19bc8 100644 --- a/dom/console/tests/xpcshell/test_basic.js +++ b/dom/console/tests/xpcshell/test_basic.js @@ -1,8 +1,6 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - add_task(async function() { Assert.ok("console" in this); diff --git a/dom/console/tests/xpcshell/test_formatting.js b/dom/console/tests/xpcshell/test_formatting.js index c4de21b41ccb..09d51b2be08c 100644 --- a/dom/console/tests/xpcshell/test_formatting.js +++ b/dom/console/tests/xpcshell/test_formatting.js @@ -1,8 +1,6 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - add_task(async function() { Assert.ok("console" in this); diff --git a/dom/console/tests/xpcshell/test_reportForServiceWorkerScope.js b/dom/console/tests/xpcshell/test_reportForServiceWorkerScope.js index f95663d9273e..fcbe3fbe8c3f 100644 --- a/dom/console/tests/xpcshell/test_reportForServiceWorkerScope.js +++ b/dom/console/tests/xpcshell/test_reportForServiceWorkerScope.js @@ -1,8 +1,6 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - add_task(async function() { let p = new Promise(resolve => { function consoleListener() { diff --git a/dom/file/tests/test_agentcluster_bloburl.js b/dom/file/tests/test_agentcluster_bloburl.js index a0037c62ac3b..eb6377674f24 100644 --- a/dom/file/tests/test_agentcluster_bloburl.js +++ b/dom/file/tests/test_agentcluster_bloburl.js @@ -6,8 +6,6 @@ const { CookieXPCShellUtils } = ChromeUtils.import( "resource://testing-common/CookieXPCShellUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - CookieXPCShellUtils.init(this); // Same agent cluster, all works fine: blobURLs can be opened. diff --git a/dom/filesystem/compat/tests/script_entries.js b/dom/filesystem/compat/tests/script_entries.js index e7793e67462c..04b17aa5c68e 100644 --- a/dom/filesystem/compat/tests/script_entries.js +++ b/dom/filesystem/compat/tests/script_entries.js @@ -1,7 +1,6 @@ /* eslint-env mozilla/frame-script */ // eslint-disable-next-line mozilla/reject-importGlobalProperties Cu.importGlobalProperties(["File", "Directory"]); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var tmpFile, tmpDir; addMessageListener("entries.open", function(e) { diff --git a/dom/filesystem/tests/script_fileList.js b/dom/filesystem/tests/script_fileList.js index c1e8bb42a8f2..db46975a8b79 100644 --- a/dom/filesystem/tests/script_fileList.js +++ b/dom/filesystem/tests/script_fileList.js @@ -1,7 +1,6 @@ /* eslint-env mozilla/frame-script */ // eslint-disable-next-line mozilla/reject-importGlobalProperties Cu.importGlobalProperties(["File"]); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function createProfDFile() { return Services.dirsvc .QueryInterface(Ci.nsIProperties) diff --git a/dom/filesystem/tests/script_promptHandler.js b/dom/filesystem/tests/script_promptHandler.js index 954c97402f33..ee0d4772d8b7 100644 --- a/dom/filesystem/tests/script_promptHandler.js +++ b/dom/filesystem/tests/script_promptHandler.js @@ -1,7 +1,5 @@ /* eslint-env mozilla/frame-script */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - let dialogObserverTopic = "common-dialog-loaded"; function dialogObserver(subj, topic, data) { diff --git a/dom/fs/test/xpcshell/head.js b/dom/fs/test/xpcshell/head.js index 33b4384010c3..810a5c3c950d 100644 --- a/dom/fs/test/xpcshell/head.js +++ b/dom/fs/test/xpcshell/head.js @@ -3,8 +3,6 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - async function require_module(id) { if (!require_module.moduleLoader) { const { ModuleLoader } = ChromeUtils.import( diff --git a/dom/indexedDB/test/bug839193.js b/dom/indexedDB/test/bug839193.js index 880d178076e3..b5b951e32e56 100644 --- a/dom/indexedDB/test/bug839193.js +++ b/dom/indexedDB/test/bug839193.js @@ -4,8 +4,6 @@ const nsIQuotaManagerService = Ci.nsIQuotaManagerService; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var gURI = Services.io.newURI("http://localhost"); function onUsageCallback(request) {} diff --git a/dom/indexedDB/test/unit/xpcshell-head-parent-process.js b/dom/indexedDB/test/unit/xpcshell-head-parent-process.js index c6c5466a73e6..90ce0a8f1ba4 100644 --- a/dom/indexedDB/test/unit/xpcshell-head-parent-process.js +++ b/dom/indexedDB/test/unit/xpcshell-head-parent-process.js @@ -10,8 +10,6 @@ var { classes: Cc, interfaces: Ci, utils: Cu } = Components; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - if (!("self" in this)) { this.self = this; } diff --git a/dom/ipc/tests/test_bug1086684.js b/dom/ipc/tests/test_bug1086684.js index de7cfc00db34..aaf2e0ff5963 100644 --- a/dom/ipc/tests/test_bug1086684.js +++ b/dom/ipc/tests/test_bug1086684.js @@ -1,7 +1,6 @@ "use strict"; /* eslint-env mozilla/frame-script */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCShellContentUtils } = ChromeUtils.import( "resource://testing-common/XPCShellContentUtils.jsm" ); diff --git a/dom/ipc/tests/test_sharedMap.js b/dom/ipc/tests/test_sharedMap.js index 4fb1548e7806..b1ebe6b7218b 100644 --- a/dom/ipc/tests/test_sharedMap.js +++ b/dom/ipc/tests/test_sharedMap.js @@ -3,7 +3,6 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { ExtensionUtils } = ChromeUtils.import( "resource://gre/modules/ExtensionUtils.jsm" ); diff --git a/dom/localstorage/test/unit/head.js b/dom/localstorage/test/unit/head.js index 27d3381363d5..0e0cc10f5413 100644 --- a/dom/localstorage/test/unit/head.js +++ b/dom/localstorage/test/unit/head.js @@ -8,8 +8,6 @@ const NS_ERROR_DOM_QUOTA_EXCEEDED_ERR = 22; -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function is(a, b, msg) { Assert.equal(a, b, msg); } diff --git a/dom/media/webrtc/tests/mochitests/NetworkPreparationChromeScript.js b/dom/media/webrtc/tests/mochitests/NetworkPreparationChromeScript.js index 271a422881fd..a7b7c0738506 100644 --- a/dom/media/webrtc/tests/mochitests/NetworkPreparationChromeScript.js +++ b/dom/media/webrtc/tests/mochitests/NetworkPreparationChromeScript.js @@ -1,8 +1,6 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var browser = Services.wm.getMostRecentWindow("navigator:browser"); var connection = browser.navigator.mozMobileConnections[0]; diff --git a/dom/network/tests/test_tcpsocket_client_and_server_basics.js b/dom/network/tests/test_tcpsocket_client_and_server_basics.js index 4142968ac1ef..cff49908e5b4 100644 --- a/dom/network/tests/test_tcpsocket_client_and_server_basics.js +++ b/dom/network/tests/test_tcpsocket_client_and_server_basics.js @@ -1,6 +1,5 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); // Bug 788960 and later bug 1329245 have taught us that attempting to connect to // a port that is not listening or is no longer listening fails to consistently // result in the error (or any) event we expect on Darwin/OSX/"OS X". diff --git a/dom/notification/test/unit/head_notificationdb.js b/dom/notification/test/unit/head_notificationdb.js index 249b98e88dac..897190c0732f 100644 --- a/dom/notification/test/unit/head_notificationdb.js +++ b/dom/notification/test/unit/head_notificationdb.js @@ -3,7 +3,6 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function getNotificationObject(app, id, tag, includeScope) { const origin = `https://${app}.gaiamobile.org/`; diff --git a/dom/promise/tests/unit/test_promise_job_across_sandbox.js b/dom/promise/tests/unit/test_promise_job_across_sandbox.js index 9dac56113c4e..02d948340c9a 100644 --- a/dom/promise/tests/unit/test_promise_job_across_sandbox.js +++ b/dom/promise/tests/unit/test_promise_job_across_sandbox.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function createSandbox() { const uri = Services.io.newURI("https://example.com"); const principal = Services.scriptSecurityManager.createContentPrincipal( diff --git a/dom/promise/tests/unit/test_promise_unhandled_rejection.js b/dom/promise/tests/unit/test_promise_unhandled_rejection.js index 534ffebdedf5..8544dd55473f 100644 --- a/dom/promise/tests/unit/test_promise_unhandled_rejection.js +++ b/dom/promise/tests/unit/test_promise_unhandled_rejection.js @@ -3,7 +3,6 @@ // Tests that unhandled promise rejections generate the appropriate // console messages. -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { AddonTestUtils } = ChromeUtils.import( "resource://testing-common/AddonTestUtils.jsm" ); diff --git a/dom/push/test/xpcshell/head.js b/dom/push/test/xpcshell/head.js index 6d12b3a73040..e5721c82b744 100644 --- a/dom/push/test/xpcshell/head.js +++ b/dom/push/test/xpcshell/head.js @@ -6,7 +6,6 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { ObjectUtils: "resource://gre/modules/ObjectUtils.jsm", diff --git a/dom/quota/test/xpcshell/caching/head.js b/dom/quota/test/xpcshell/caching/head.js index bba8e7181fc2..5c36d82ca69d 100644 --- a/dom/quota/test/xpcshell/caching/head.js +++ b/dom/quota/test/xpcshell/caching/head.js @@ -6,8 +6,6 @@ // The path to the top level directory. const depth = "../../../../../"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - loadScript("dom/quota/test/xpcshell/common/head.js"); function loadScript(path) { diff --git a/dom/quota/test/xpcshell/head.js b/dom/quota/test/xpcshell/head.js index 344a90702245..bf9ba22ce3e3 100644 --- a/dom/quota/test/xpcshell/head.js +++ b/dom/quota/test/xpcshell/head.js @@ -6,8 +6,6 @@ // The path to the top level directory. const depth = "../../../../"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - loadScript("dom/quota/test/xpcshell/common/head.js"); function loadScript(path) { diff --git a/dom/quota/test/xpcshell/telemetry/head.js b/dom/quota/test/xpcshell/telemetry/head.js index bba8e7181fc2..5c36d82ca69d 100644 --- a/dom/quota/test/xpcshell/telemetry/head.js +++ b/dom/quota/test/xpcshell/telemetry/head.js @@ -6,8 +6,6 @@ // The path to the top level directory. const depth = "../../../../../"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - loadScript("dom/quota/test/xpcshell/common/head.js"); function loadScript(path) { diff --git a/dom/quota/test/xpcshell/upgrades/head.js b/dom/quota/test/xpcshell/upgrades/head.js index bba8e7181fc2..5c36d82ca69d 100644 --- a/dom/quota/test/xpcshell/upgrades/head.js +++ b/dom/quota/test/xpcshell/upgrades/head.js @@ -6,8 +6,6 @@ // The path to the top level directory. const depth = "../../../../../"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - loadScript("dom/quota/test/xpcshell/common/head.js"); function loadScript(path) { diff --git a/dom/security/test/cors/file_CrossSiteXHR_cache_server.sjs b/dom/security/test/cors/file_CrossSiteXHR_cache_server.sjs index 803597f38d93..3e8f291327d4 100644 --- a/dom/security/test/cors/file_CrossSiteXHR_cache_server.sjs +++ b/dom/security/test/cors/file_CrossSiteXHR_cache_server.sjs @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function handleRequest(request, response) { var query = {}; request.queryString.split("&").forEach(function(val) { diff --git a/dom/security/test/cors/file_CrossSiteXHR_server.sjs b/dom/security/test/cors/file_CrossSiteXHR_server.sjs index 746c980bad92..a2e93ba0296e 100644 --- a/dom/security/test/cors/file_CrossSiteXHR_server.sjs +++ b/dom/security/test/cors/file_CrossSiteXHR_server.sjs @@ -4,7 +4,6 @@ const BinaryInputStream = CC( "nsIBinaryInputStream", "setInputStream" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true); // eslint-disable-next-line complexity diff --git a/dom/security/test/csp/file_report_chromescript.js b/dom/security/test/csp/file_report_chromescript.js index 36324585ab89..94c19aa98fe1 100644 --- a/dom/security/test/csp/file_report_chromescript.js +++ b/dom/security/test/csp/file_report_chromescript.js @@ -1,4 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); Cu.importGlobalProperties(["TextDecoder"]); diff --git a/dom/security/test/unit/test_csp_reports.js b/dom/security/test/unit/test_csp_reports.js index a0a32388d585..525c73ac8a4b 100644 --- a/dom/security/test/unit/test_csp_reports.js +++ b/dom/security/test/unit/test_csp_reports.js @@ -3,7 +3,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); var httpServer = new HttpServer(); diff --git a/dom/security/test/unit/test_csp_upgrade_insecure_request_header.js b/dom/security/test/unit/test_csp_upgrade_insecure_request_header.js index 217a2fbe81ce..ebcb5b7a9e99 100644 --- a/dom/security/test/unit/test_csp_upgrade_insecure_request_header.js +++ b/dom/security/test/unit/test_csp_upgrade_insecure_request_header.js @@ -3,7 +3,6 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); // Since this test creates a TYPE_DOCUMENT channel via javascript, it will // end up using the wrong LoadInfo constructor. Setting this pref will disable diff --git a/dom/security/test/unit/test_https_only_https_first_default_port.js b/dom/security/test/unit/test_https_only_https_first_default_port.js index 909f467a5904..eda44adb16ca 100644 --- a/dom/security/test/unit/test_https_only_https_first_default_port.js +++ b/dom/security/test/unit/test_https_only_https_first_default_port.js @@ -1,6 +1,5 @@ const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); 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/dom/security/test/unit/test_https_only_https_first_prefs.js b/dom/security/test/unit/test_https_only_https_first_prefs.js index aa96f1e838c8..17894bedc140 100644 --- a/dom/security/test/unit/test_https_only_https_first_prefs.js +++ b/dom/security/test/unit/test_https_only_https_first_prefs.js @@ -1,6 +1,5 @@ const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); 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/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js b/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js index 62e54df13c35..70417fcb05f7 100644 --- a/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js +++ b/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js @@ -10,7 +10,6 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyServiceGetter( this, diff --git a/dom/serviceworkers/test/console_monitor.js b/dom/serviceworkers/test/console_monitor.js index 3aa51d299622..b2cf4f731832 100644 --- a/dom/serviceworkers/test/console_monitor.js +++ b/dom/serviceworkers/test/console_monitor.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - let consoleListener; function ConsoleListener() { diff --git a/dom/streams/test/xpcshell/large-pipeto.js b/dom/streams/test/xpcshell/large-pipeto.js index 3e26f3f403e9..c271a140a0eb 100644 --- a/dom/streams/test/xpcshell/large-pipeto.js +++ b/dom/streams/test/xpcshell/large-pipeto.js @@ -1,7 +1,6 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); // Stamp an array buffer with a pattern; verified by verify_chunk below. function init(array) { diff --git a/dom/tests/unit/test_bug465752.js b/dom/tests/unit/test_bug465752.js index 8e05edaf0902..19c03a0e4da9 100644 --- a/dom/tests/unit/test_bug465752.js +++ b/dom/tests/unit/test_bug465752.js @@ -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"); function run_test() { const str = "javascript:10"; diff --git a/dom/tests/unit/test_geolocation_monitor.js b/dom/tests/unit/test_geolocation_monitor.js index 319c69e73b69..e6d3b3a28071 100644 --- a/dom/tests/unit/test_geolocation_monitor.js +++ b/dom/tests/unit/test_geolocation_monitor.js @@ -1,5 +1,4 @@ const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); let geolocation = null; let numRequests = 0; diff --git a/dom/tests/unit/test_geolocation_position_unavailable.js b/dom/tests/unit/test_geolocation_position_unavailable.js index 7e1584b661ed..667a84f050cb 100644 --- a/dom/tests/unit/test_geolocation_position_unavailable.js +++ b/dom/tests/unit/test_geolocation_position_unavailable.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function successCallback() { Assert.ok(false); do_test_finished(); diff --git a/dom/tests/unit/test_geolocation_position_unavailable_wrap.js b/dom/tests/unit/test_geolocation_position_unavailable_wrap.js index 789547faff9c..ca80fdb83a31 100644 --- a/dom/tests/unit/test_geolocation_position_unavailable_wrap.js +++ b/dom/tests/unit/test_geolocation_position_unavailable_wrap.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function run_test() { Services.prefs.setBoolPref("geo.provider.network.scan", false); diff --git a/dom/tests/unit/test_geolocation_provider.js b/dom/tests/unit/test_geolocation_provider.js index 0340c330c126..cb0b9a3021d8 100644 --- a/dom/tests/unit/test_geolocation_provider.js +++ b/dom/tests/unit/test_geolocation_provider.js @@ -1,5 +1,4 @@ const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var httpserver = null; var geolocation = null; diff --git a/dom/tests/unit/test_geolocation_provider_timeout.js b/dom/tests/unit/test_geolocation_provider_timeout.js index 282f4de1f342..6f311a5aa816 100644 --- a/dom/tests/unit/test_geolocation_provider_timeout.js +++ b/dom/tests/unit/test_geolocation_provider_timeout.js @@ -1,5 +1,4 @@ const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var httpserver = null; var geolocation = null; diff --git a/dom/tests/unit/test_geolocation_reset_accuracy.js b/dom/tests/unit/test_geolocation_reset_accuracy.js index 71c07bab9bdb..3cb3374e09a2 100644 --- a/dom/tests/unit/test_geolocation_reset_accuracy.js +++ b/dom/tests/unit/test_geolocation_reset_accuracy.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const providerCID = Components.ID("{14aa4b81-e266-45cb-88f8-89595dece114}"); const providerContract = "@mozilla.org/geolocation/provider;1"; diff --git a/dom/tests/unit/test_geolocation_reset_accuracy_wrap.js b/dom/tests/unit/test_geolocation_reset_accuracy_wrap.js index c09d663c2c7a..4160fda14a9a 100644 --- a/dom/tests/unit/test_geolocation_reset_accuracy_wrap.js +++ b/dom/tests/unit/test_geolocation_reset_accuracy_wrap.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const providerCID = Components.ID("{14aa4b81-e266-45cb-88f8-89595dece114}"); const providerContract = "@mozilla.org/geolocation/provider;1"; diff --git a/dom/tests/unit/test_geolocation_timeout.js b/dom/tests/unit/test_geolocation_timeout.js index bd1eb6368d61..a3e2ec868289 100644 --- a/dom/tests/unit/test_geolocation_timeout.js +++ b/dom/tests/unit/test_geolocation_timeout.js @@ -1,5 +1,4 @@ const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var httpserver = null; var geolocation = null; diff --git a/dom/tests/unit/test_geolocation_timeout_wrap.js b/dom/tests/unit/test_geolocation_timeout_wrap.js index 79691a456423..cdde9543bd50 100644 --- a/dom/tests/unit/test_geolocation_timeout_wrap.js +++ b/dom/tests/unit/test_geolocation_timeout_wrap.js @@ -1,5 +1,4 @@ const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var httpserver = null; diff --git a/dom/workers/test/xpcshell/test_remoteworker_launch_new_process.js b/dom/workers/test/xpcshell/test_remoteworker_launch_new_process.js index d559362b72a3..47635e2f8293 100644 --- a/dom/workers/test/xpcshell/test_remoteworker_launch_new_process.js +++ b/dom/workers/test/xpcshell/test_remoteworker_launch_new_process.js @@ -2,8 +2,6 @@ /* vim: set sts=2 sw=2 et tw=80: */ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const { TestUtils } = ChromeUtils.import( "resource://testing-common/TestUtils.jsm" ); diff --git a/extensions/permissions/test/unit/head.js b/extensions/permissions/test/unit/head.js index 757123425629..48ef75c81e4c 100644 --- a/extensions/permissions/test/unit/head.js +++ b/extensions/permissions/test/unit/head.js @@ -2,7 +2,6 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); // Helper to step a generator function and catch a StopIteration exception. diff --git a/extensions/pref/autoconfig/test/unit/test_autoconfig.js b/extensions/pref/autoconfig/test/unit/test_autoconfig.js index 2951cadbd1ca..1381bcb4f3f6 100644 --- a/extensions/pref/autoconfig/test/unit/test_autoconfig.js +++ b/extensions/pref/autoconfig/test/unit/test_autoconfig.js @@ -5,8 +5,6 @@ /* Turning off this rule to allow control flow operations in finally block * http://eslint.org/docs/rules/no-unsafe-finally */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function run_test() { let env = Cc["@mozilla.org/process/environment;1"].getService( Ci.nsIEnvironment diff --git a/extensions/pref/autoconfig/test/unit/test_autoconfig_no_sandbox.js b/extensions/pref/autoconfig/test/unit/test_autoconfig_no_sandbox.js index 3efccaff3206..1eefabd0cd61 100644 --- a/extensions/pref/autoconfig/test/unit/test_autoconfig_no_sandbox.js +++ b/extensions/pref/autoconfig/test/unit/test_autoconfig_no_sandbox.js @@ -3,8 +3,6 @@ /* eslint no-unsafe-finally: "off"*/ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function run_test() { let prefs = Services.prefs.getBranch(null); diff --git a/extensions/pref/autoconfig/test/unit/test_autoconfig_nonascii.js b/extensions/pref/autoconfig/test/unit/test_autoconfig_nonascii.js index bbad99012f5e..cee45514783f 100644 --- a/extensions/pref/autoconfig/test/unit/test_autoconfig_nonascii.js +++ b/extensions/pref/autoconfig/test/unit/test_autoconfig_nonascii.js @@ -5,8 +5,6 @@ /* Turning off this rule to allow control flow operations in finally block * http://eslint.org/docs/rules/no-unsafe-finally */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function run_test() { let greD = Services.dirsvc.get("GreD", Ci.nsIFile); let defaultPrefD = Services.dirsvc.get("PrfDef", Ci.nsIFile); diff --git a/extensions/spellcheck/tests/mochitest/helper_bug1170484.js b/extensions/spellcheck/tests/mochitest/helper_bug1170484.js index be6505bb4490..408305b1c3c9 100644 --- a/extensions/spellcheck/tests/mochitest/helper_bug1170484.js +++ b/extensions/spellcheck/tests/mochitest/helper_bug1170484.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - /* eslint-env mozilla/frame-script */ // Chrome scripts are run with synchronous messages, so make sure we're completely diff --git a/extensions/universalchardet/tests/CharsetDetectionTests.js b/extensions/universalchardet/tests/CharsetDetectionTests.js index a92b808e4502..8d6ebad96446 100644 --- a/extensions/universalchardet/tests/CharsetDetectionTests.js +++ b/extensions/universalchardet/tests/CharsetDetectionTests.js @@ -1,6 +1,5 @@ /* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- */ /* vim: set ts=8 et sw=4 tw=80: */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var gExpectedCharset; var gLocalDir; diff --git a/image/test/browser/browser_bug666317.js b/image/test/browser/browser_bug666317.js index ac537c569ddc..7f58c61c5633 100644 --- a/image/test/browser/browser_bug666317.js +++ b/image/test/browser/browser_bug666317.js @@ -1,5 +1,4 @@ waitForExplicitFinish(); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var pageSource = "" + diff --git a/image/test/unit/test_async_notification.js b/image/test/unit/test_async_notification.js index 524af5ecb237..80e8d66d397e 100644 --- a/image/test/unit/test_async_notification.js +++ b/image/test/unit/test_async_notification.js @@ -3,7 +3,6 @@ */ // A simple 3x3 png; rows go red, green, blue. Stolen from the PNG encoder test. -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var pngspec = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAADCAIAAADZSiLoAAAAEUlEQVQImWP4z8AAQTAamQkAhpcI+DeMzFcAAAAASUVORK5CYII="; diff --git a/image/test/unit/test_async_notification_404.js b/image/test/unit/test_async_notification_404.js index dc1fbe22f004..202ddc76443e 100644 --- a/image/test/unit/test_async_notification_404.js +++ b/image/test/unit/test_async_notification_404.js @@ -4,7 +4,6 @@ */ /* import-globals-from async_load_tests.js */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/image/test/unit/test_async_notification_animated.js b/image/test/unit/test_async_notification_animated.js index abbe67b8dfcc..1f99859fe680 100644 --- a/image/test/unit/test_async_notification_animated.js +++ b/image/test/unit/test_async_notification_animated.js @@ -7,7 +7,6 @@ */ // transparent-animation.gif from the gif reftests. -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var spec = "data:image/gif;base64,R0lGODlhZABkAIABAP8AAP///yH5BAkBAAEALAAAAABLAGQAAAK8jI+py+0Po5y02ouz3rz7D4biSJbmiabqyrbuC8fyTNf2jef6zvf+DwwKh8Si8YhMKpchgPMJjUqnVOipis1ir9qul+sNV8HistVkTj/JajG7/UXDy+95tm4fy/NdPF/q93dWIqgVWAhwWKgoyPjnyAeZJ2lHOWcJh9mmqcaZ5mkGSreHOCXqRloadRrGGkeoapoa6+TaN0tra4gbq3vHq+q7BVwqrMeEnKy8zNzs/AwdLT1NXW19jZ1tUgAAIfkECQEAAQAsAAAAADQAZAAAArCMj6nL7Q+jnLTai7PevPsPhuJIluaJpurKtu4Lx/JM1/aN5/rO9/7vAAiHxKLxiCRCkswmc+mMSqHSapJqzSof2u4Q67WCw1MuOTs+N9Pqq7kdZcON8vk2aF+/88g6358HaCc4Rwhn2IaopnjGSOYYBukl2UWpZYm2x0enuXnX4NnXGQqAKTYaalqlWoZH+snwWsQah+pJ64Sr5ypbCvQLHCw8TFxsfIycrLzM3PxQAAAh+QQJAQABACwAAAAAGwBkAAACUIyPqcvtD6OctNqLs968+w+G4kiW5omm6sq27gTE8kzX9o3n+s73/g8MCofEovGITCqXzKbzCY1Kp9Sq9YrNarfcrvdrfYnH5LL5jE6r16sCADs="; diff --git a/image/test/unit/test_moz_icon_uri.js b/image/test/unit/test_moz_icon_uri.js index 474a6838d4ac..0111d71d2a90 100644 --- a/image/test/unit/test_moz_icon_uri.js +++ b/image/test/unit/test_moz_icon_uri.js @@ -10,7 +10,6 @@ // Plus we also support moz-icon://[valid URL] for backwards compatibility. // Main test entry point. -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function run_test() { let ioService = Services.io; diff --git a/image/test/unit/test_private_channel.js b/image/test/unit/test_private_channel.js index 46bae8c3aa6e..9ed702baf15a 100644 --- a/image/test/unit/test_private_channel.js +++ b/image/test/unit/test_private_channel.js @@ -1,4 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); diff --git a/intl/l10n/test/test_localization.js b/intl/l10n/test/test_localization.js index edcea83cc683..68a7378ac898 100644 --- a/intl/l10n/test/test_localization.js +++ b/intl/l10n/test/test_localization.js @@ -2,7 +2,6 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ const { AppConstants } = ChromeUtils.import("resource://gre/modules/AppConstants.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); add_task(function test_methods_presence() { strictEqual(typeof Localization.prototype.formatValues, "function"); diff --git a/intl/l10n/test/test_localization_sync.js b/intl/l10n/test/test_localization_sync.js index 1e0de4e1c04f..2df8fa514259 100644 --- a/intl/l10n/test/test_localization_sync.js +++ b/intl/l10n/test/test_localization_sync.js @@ -2,7 +2,6 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ const { AppConstants } = ChromeUtils.import("resource://gre/modules/AppConstants.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); add_task(function test_methods_calling() { const l10nReg = new L10nRegistry(); diff --git a/intl/l10n/test/test_pseudo.js b/intl/l10n/test/test_pseudo.js index b39d42637ed3..23404aab128a 100644 --- a/intl/l10n/test/test_pseudo.js +++ b/intl/l10n/test/test_pseudo.js @@ -1,7 +1,6 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const originalValues = { requested: Services.locale.requestedLocales, diff --git a/intl/locale/tests/unit/test_langPackMatcher.js b/intl/locale/tests/unit/test_langPackMatcher.js index 651e543506be..5a98aba1f893 100644 --- a/intl/locale/tests/unit/test_langPackMatcher.js +++ b/intl/locale/tests/unit/test_langPackMatcher.js @@ -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 { getAddonAndLocalAPIsMocker } = ChromeUtils.import( "resource://testing-common/LangPackMatcherTestUtils.jsm" ); diff --git a/intl/locale/tests/unit/test_localeService.js b/intl/locale/tests/unit/test_localeService.js index 2ad0f82a3443..ae2d949e806e 100644 --- a/intl/locale/tests/unit/test_localeService.js +++ b/intl/locale/tests/unit/test_localeService.js @@ -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 osPrefs = Cc["@mozilla.org/intl/ospreferences;1"].getService( Ci.mozIOSPreferences ); diff --git a/intl/locale/tests/unit/test_localeService_negotiateLanguages.js b/intl/locale/tests/unit/test_localeService_negotiateLanguages.js index 392a2dd7d970..bd2cb0ffbbd1 100644 --- a/intl/locale/tests/unit/test_localeService_negotiateLanguages.js +++ b/intl/locale/tests/unit/test_localeService_negotiateLanguages.js @@ -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 localeService = Services.locale; const data = { diff --git a/intl/strres/tests/unit/test_bug378839.js b/intl/strres/tests/unit/test_bug378839.js index 360e520761ef..b3bc76f3d6fd 100644 --- a/intl/strres/tests/unit/test_bug378839.js +++ b/intl/strres/tests/unit/test_bug378839.js @@ -1,8 +1,6 @@ /* Tests getting properties from string bundles */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const name_file = "file"; const value_file = "File"; diff --git a/intl/strres/tests/unit/test_bug397093.js b/intl/strres/tests/unit/test_bug397093.js index ccc9b5f2aa00..a2bb1eb23637 100644 --- a/intl/strres/tests/unit/test_bug397093.js +++ b/intl/strres/tests/unit/test_bug397093.js @@ -4,8 +4,6 @@ * all GetStringFromName calls should fail. */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const name_ascii = "asciiProperty"; const value_ascii = ""; diff --git a/intl/uconv/tests/unit/head_charsetConversionTests.js b/intl/uconv/tests/unit/head_charsetConversionTests.js index 1f983f917c84..4fbf6e9af725 100644 --- a/intl/uconv/tests/unit/head_charsetConversionTests.js +++ b/intl/uconv/tests/unit/head_charsetConversionTests.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var CC = Components.Constructor; function CreateScriptableConverter() { diff --git a/js/xpconnect/tests/chrome/subscript.js b/js/xpconnect/tests/chrome/subscript.js index 266628abc627..bcfbccafc9b2 100644 --- a/js/xpconnect/tests/chrome/subscript.js +++ b/js/xpconnect/tests/chrome/subscript.js @@ -1,5 +1,3 @@ -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var ns = {}; Services.scriptloader.loadSubScript("resource://gre/modules/NetUtil.jsm", ns); var NetUtil = ns.NetUtil; diff --git a/js/xpconnect/tests/unit/head_ongc.js b/js/xpconnect/tests/unit/head_ongc.js index 14caf7aa3792..61b5fd5efc3e 100644 --- a/js/xpconnect/tests/unit/head_ongc.js +++ b/js/xpconnect/tests/unit/head_ongc.js @@ -1,4 +1,3 @@ -var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); var {addDebuggerToGlobal, addSandboxedDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm"); const testingFunctions = Cu.getJSTestingFunctions(); diff --git a/js/xpconnect/tests/unit/test_ComponentEnvironment.js b/js/xpconnect/tests/unit/test_ComponentEnvironment.js index 97ea2d4567a4..1d2c474ffd7e 100644 --- a/js/xpconnect/tests/unit/test_ComponentEnvironment.js +++ b/js/xpconnect/tests/unit/test_ComponentEnvironment.js @@ -1,5 +1,3 @@ -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); - let tgt = {}; Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true); diff --git a/js/xpconnect/tests/unit/test_FrameScriptEnvironment.js b/js/xpconnect/tests/unit/test_FrameScriptEnvironment.js index 289a594a37f6..d02c9900e140 100644 --- a/js/xpconnect/tests/unit/test_FrameScriptEnvironment.js +++ b/js/xpconnect/tests/unit/test_FrameScriptEnvironment.js @@ -1,5 +1,3 @@ -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); - let ppmm = Services.ppmm.getChildAt(0); Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true); diff --git a/js/xpconnect/tests/unit/test_SubscriptLoaderEnvironment.js b/js/xpconnect/tests/unit/test_SubscriptLoaderEnvironment.js index e23fe1b68d46..c0a5cf202c5d 100644 --- a/js/xpconnect/tests/unit/test_SubscriptLoaderEnvironment.js +++ b/js/xpconnect/tests/unit/test_SubscriptLoaderEnvironment.js @@ -1,5 +1,3 @@ -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); - let tgt = {}; Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true); diff --git a/js/xpconnect/tests/unit/test_SubscriptLoaderJSMEnvironment.js b/js/xpconnect/tests/unit/test_SubscriptLoaderJSMEnvironment.js index 58f6dfc72dfe..1ae9bc3b74d9 100644 --- a/js/xpconnect/tests/unit/test_SubscriptLoaderJSMEnvironment.js +++ b/js/xpconnect/tests/unit/test_SubscriptLoaderJSMEnvironment.js @@ -1,5 +1,3 @@ -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); - let tgt_load = {}; let tgt_check = {}; diff --git a/js/xpconnect/tests/unit/test_SubscriptLoaderSandboxEnvironment.js b/js/xpconnect/tests/unit/test_SubscriptLoaderSandboxEnvironment.js index 98ba5ef9c133..3f4a10a14fb5 100644 --- a/js/xpconnect/tests/unit/test_SubscriptLoaderSandboxEnvironment.js +++ b/js/xpconnect/tests/unit/test_SubscriptLoaderSandboxEnvironment.js @@ -1,5 +1,3 @@ -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); - let tgt = Cu.Sandbox(Services.scriptSecurityManager.getSystemPrincipal()); Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true); diff --git a/js/xpconnect/tests/unit/test_bug1244222.js b/js/xpconnect/tests/unit/test_bug1244222.js index 59b43ebbad0d..b907c72033ee 100644 --- a/js/xpconnect/tests/unit/test_bug1244222.js +++ b/js/xpconnect/tests/unit/test_bug1244222.js @@ -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"); - Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true); registerCleanupFunction(() => { Services.prefs.clearUserPref("security.allow_eval_with_system_principal"); diff --git a/js/xpconnect/tests/unit/test_callFunctionWithAsyncStack.js b/js/xpconnect/tests/unit/test_callFunctionWithAsyncStack.js index 87d98fc6efbb..75c3fa013e4a 100644 --- a/js/xpconnect/tests/unit/test_callFunctionWithAsyncStack.js +++ b/js/xpconnect/tests/unit/test_callFunctionWithAsyncStack.js @@ -1,5 +1,3 @@ -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function run_test() { if (!Services.prefs.getBoolPref("javascript.options.asyncstack")) { info("Async stacks are disabled."); diff --git a/js/xpconnect/tests/unit/test_compileScript.js b/js/xpconnect/tests/unit/test_compileScript.js index 8308df34d8b7..5de1d5d01a66 100644 --- a/js/xpconnect/tests/unit/test_compileScript.js +++ b/js/xpconnect/tests/unit/test_compileScript.js @@ -1,7 +1,5 @@ "use strict"; -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); - add_task(async function() { let scriptUrl = Services.io.newFileURI(do_get_file("file_simple_script.js")).spec; diff --git a/js/xpconnect/tests/unit/test_import_from_sandbox.js b/js/xpconnect/tests/unit/test_import_from_sandbox.js index ac99e4240a15..ddd384a77bd8 100644 --- a/js/xpconnect/tests/unit/test_import_from_sandbox.js +++ b/js/xpconnect/tests/unit/test_import_from_sandbox.js @@ -1,7 +1,5 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function makeSandbox() { return Cu.Sandbox( Services.scriptSecurityManager.getSystemPrincipal(), diff --git a/js/xpconnect/tests/unit/test_js_memory_telemetry.js b/js/xpconnect/tests/unit/test_js_memory_telemetry.js index d5ba4ab39d62..4c44f2e48cfd 100644 --- a/js/xpconnect/tests/unit/test_js_memory_telemetry.js +++ b/js/xpconnect/tests/unit/test_js_memory_telemetry.js @@ -1,7 +1,5 @@ "use strict"; -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); - add_task(function test_compartment_realm_counts() { const compsSystem = "MEMORY_JS_COMPARTMENTS_SYSTEM"; const compsUser = "MEMORY_JS_COMPARTMENTS_USER"; diff --git a/js/xpconnect/tests/unit/test_nuke_sandbox_event_listeners.js b/js/xpconnect/tests/unit/test_nuke_sandbox_event_listeners.js index 159b583cc71a..2e304a8b72c4 100644 --- a/js/xpconnect/tests/unit/test_nuke_sandbox_event_listeners.js +++ b/js/xpconnect/tests/unit/test_nuke_sandbox_event_listeners.js @@ -4,8 +4,6 @@ // See https://bugzilla.mozilla.org/show_bug.cgi?id=1273251 -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function promiseEvent(target, event) { return new Promise(resolve => { target.addEventListener(event, resolve, {capture: true, once: true}); diff --git a/js/xpconnect/tests/unit/test_nuke_webextension_wrappers.js b/js/xpconnect/tests/unit/test_nuke_webextension_wrappers.js index 5664561778da..12408403223e 100644 --- a/js/xpconnect/tests/unit/test_nuke_webextension_wrappers.js +++ b/js/xpconnect/tests/unit/test_nuke_webextension_wrappers.js @@ -1,6 +1,5 @@ // See https://bugzilla.mozilla.org/show_bug.cgi?id=1273251 -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); ChromeUtils.import("resource://gre/modules/Timer.jsm"); const {TestUtils} = ChromeUtils.import("resource://testing-common/TestUtils.jsm"); diff --git a/js/xpconnect/tests/unit/test_private_field_xrays.js b/js/xpconnect/tests/unit/test_private_field_xrays.js index c67652561c46..ca5c7c203852 100644 --- a/js/xpconnect/tests/unit/test_private_field_xrays.js +++ b/js/xpconnect/tests/unit/test_private_field_xrays.js @@ -1,7 +1,6 @@ 'use strict' ChromeUtils.import('resource://gre/modules/Preferences.jsm'); -const {Services} = ChromeUtils.import('resource://gre/modules/Services.jsm'); add_task(async function() { let webnav = Services.appShell.createWindowlessBrowser(false); diff --git a/js/xpconnect/tests/unit/test_subScriptLoader.js b/js/xpconnect/tests/unit/test_subScriptLoader.js index 65947d44385a..70301f9da435 100644 --- a/js/xpconnect/tests/unit/test_subScriptLoader.js +++ b/js/xpconnect/tests/unit/test_subScriptLoader.js @@ -1,7 +1,5 @@ "use strict"; -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); - add_task(async function test_executeScriptAfterNuked() { let scriptUrl = Services.io.newFileURI(do_get_file("file_simple_script.js")).spec; diff --git a/js/xpconnect/tests/unit/test_uawidget_scope.js b/js/xpconnect/tests/unit/test_uawidget_scope.js index 7aed7bdbb91d..03e77647e14f 100644 --- a/js/xpconnect/tests/unit/test_uawidget_scope.js +++ b/js/xpconnect/tests/unit/test_uawidget_scope.js @@ -3,7 +3,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ChromeUtils.import("resource://gre/modules/Timer.jsm"); -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const {TestUtils} = ChromeUtils.import("resource://testing-common/TestUtils.jsm"); diff --git a/js/xpconnect/tests/unit/test_xpcomutils.js b/js/xpconnect/tests/unit/test_xpcomutils.js index 8ab7aa49c118..0f648f3aace7 100644 --- a/js/xpconnect/tests/unit/test_xpcomutils.js +++ b/js/xpconnect/tests/unit/test_xpcomutils.js @@ -12,7 +12,6 @@ const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm"); const {ComponentUtils} = ChromeUtils.import("resource://gre/modules/ComponentUtils.jsm"); const {Preferences} = ChromeUtils.import("resource://gre/modules/Preferences.jsm"); -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); //////////////////////////////////////////////////////////////////////////////// diff --git a/js/xpconnect/tests/unit/test_xray_SavedFrame-02.js b/js/xpconnect/tests/unit/test_xray_SavedFrame-02.js index 6bf5e22ff009..6996c846ea97 100644 --- a/js/xpconnect/tests/unit/test_xray_SavedFrame-02.js +++ b/js/xpconnect/tests/unit/test_xray_SavedFrame-02.js @@ -1,7 +1,6 @@ // Test calling SavedFrame getters across wrappers from privileged and // un-privileged globals. -const {Services} = ChromeUtils.import('resource://gre/modules/Services.jsm'); const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm"); addDebuggerToGlobal(this); diff --git a/js/xpconnect/tests/unit/test_xray_SavedFrame.js b/js/xpconnect/tests/unit/test_xray_SavedFrame.js index a68793bfee14..c9b4e330d1c0 100644 --- a/js/xpconnect/tests/unit/test_xray_SavedFrame.js +++ b/js/xpconnect/tests/unit/test_xray_SavedFrame.js @@ -1,7 +1,6 @@ // Bug 1117242: Test calling SavedFrame getters from globals that don't subsume // that frame's principals. -const {Services} = ChromeUtils.import('resource://gre/modules/Services.jsm'); const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm"); addDebuggerToGlobal(this); diff --git a/js/xpconnect/tests/unit/test_xray_instanceof.js b/js/xpconnect/tests/unit/test_xray_instanceof.js index bb08729ee57e..950d7c006004 100644 --- a/js/xpconnect/tests/unit/test_xray_instanceof.js +++ b/js/xpconnect/tests/unit/test_xray_instanceof.js @@ -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"); - add_task(function instanceof_xrays() { let sandbox = Cu.Sandbox(null); Cu.evalInSandbox(` diff --git a/js/xpconnect/tests/unit/test_xray_named_element_access.js b/js/xpconnect/tests/unit/test_xray_named_element_access.js index 938d1575cabe..952418421488 100644 --- a/js/xpconnect/tests/unit/test_xray_named_element_access.js +++ b/js/xpconnect/tests/unit/test_xray_named_element_access.js @@ -2,7 +2,6 @@ "use strict" ChromeUtils.import("resource://gre/modules/Preferences.jsm"); -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); add_task(async function() { let webnav = Services.appShell.createWindowlessBrowser(false); diff --git a/js/xpconnect/tests/unit/test_xrayed_iterator.js b/js/xpconnect/tests/unit/test_xrayed_iterator.js index 5cba0ea9ad87..26d40420a34f 100644 --- a/js/xpconnect/tests/unit/test_xrayed_iterator.js +++ b/js/xpconnect/tests/unit/test_xrayed_iterator.js @@ -1,5 +1,3 @@ -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); - Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true); registerCleanupFunction(() => { Services.prefs.clearUserPref("security.allow_eval_with_system_principal"); diff --git a/layout/tools/layout-debug/ui/content/layoutdebug.js b/layout/tools/layout-debug/ui/content/layoutdebug.js index aacb92b91bd5..212c333bd7fe 100644 --- a/layout/tools/layout-debug/ui/content/layoutdebug.js +++ b/layout/tools/layout-debug/ui/content/layoutdebug.js @@ -19,7 +19,6 @@ const { E10SUtils } = ChromeUtils.import( const { Preferences } = ChromeUtils.import( "resource://gre/modules/Preferences.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const FEATURES = { paintDumping: "nglayout.debug.paint_dumping", diff --git a/layout/tools/reftest/reftest-content.js b/layout/tools/reftest/reftest-content.js index 432e74493043..ba5f37c8036c 100644 --- a/layout/tools/reftest/reftest-content.js +++ b/layout/tools/reftest/reftest-content.js @@ -22,7 +22,6 @@ const { setTimeout, clearTimeout } = ChromeUtils.import( const { onSpellCheck } = ChromeUtils.import( "resource://reftest/AsyncSpellCheckTestHelper.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); // This will load chrome Custom Elements inside chrome documents: ChromeUtils.import("resource://gre/modules/CustomElementsListener.jsm"); diff --git a/memory/replace/dmd/test/test_dmd.js b/memory/replace/dmd/test/test_dmd.js index ec7ee49bfa4f..f9213ba6b33a 100644 --- a/memory/replace/dmd/test/test_dmd.js +++ b/memory/replace/dmd/test/test_dmd.js @@ -9,7 +9,6 @@ const { FileUtils } = ChromeUtils.import( "resource://gre/modules/FileUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); // The xpcshell test harness sets PYTHON so we can read it here. var gEnv = Cc["@mozilla.org/process/environment;1"].getService( diff --git a/mobile/android/chrome/geckoview/SessionStateAggregator.js b/mobile/android/chrome/geckoview/SessionStateAggregator.js index 9fdb54aaf818..6fcd61ab878a 100644 --- a/mobile/android/chrome/geckoview/SessionStateAggregator.js +++ b/mobile/android/chrome/geckoview/SessionStateAggregator.js @@ -8,7 +8,6 @@ const { GeckoViewChildModule } = ChromeUtils.import( "resource://gre/modules/GeckoViewChildModule.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/mobile/android/chrome/geckoview/config.js b/mobile/android/chrome/geckoview/config.js index 6df80948620f..26b01e209d4d 100644 --- a/mobile/android/chrome/geckoview/config.js +++ b/mobile/android/chrome/geckoview/config.js @@ -4,7 +4,6 @@ "use strict"; var Cm = Components.manager; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const VKB_ENTER_KEY = 13; // User press of VKB enter key const INITIAL_PAGE_DELAY = 500; // Initial pause on program start for scroll alignment diff --git a/mobile/android/chrome/geckoview/geckoview.js b/mobile/android/chrome/geckoview/geckoview.js index 87c3e398aa2d..92ba563b0f1e 100644 --- a/mobile/android/chrome/geckoview/geckoview.js +++ b/mobile/android/chrome/geckoview/geckoview.js @@ -10,7 +10,6 @@ var { DelayedInit } = ChromeUtils.import( var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { Blocklist: "resource://gre/modules/Blocklist.jsm", diff --git a/mobile/android/components/extensions/test/xpcshell/head.js b/mobile/android/components/extensions/test/xpcshell/head.js index a37b7ee3e56f..0fa596242b18 100644 --- a/mobile/android/components/extensions/test/xpcshell/head.js +++ b/mobile/android/components/extensions/test/xpcshell/head.js @@ -2,7 +2,6 @@ /* exported createHttpServer */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/modules/libjar/test/unit/test_bug1328865.js b/modules/libjar/test/unit/test_bug1328865.js index ec6e98e98b4d..6f1021cd9300 100644 --- a/modules/libjar/test/unit/test_bug1328865.js +++ b/modules/libjar/test/unit/test_bug1328865.js @@ -4,7 +4,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); // Check that reading non existant inner jars results in the right error diff --git a/modules/libjar/test/unit/test_bug278262.js b/modules/libjar/test/unit/test_bug278262.js index 21d62495de4c..3a5e7e951c4b 100644 --- a/modules/libjar/test/unit/test_bug278262.js +++ b/modules/libjar/test/unit/test_bug278262.js @@ -1,7 +1,5 @@ // Regression test for bug 278262 - JAR URIs should resolve relative URIs in the base section. -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const path = "data/test_bug333423.zip"; function test_relative_sub() { diff --git a/modules/libjar/test/unit/test_bug370103.js b/modules/libjar/test/unit/test_bug370103.js index 059cadee03e4..d9d0e3e6a295 100644 --- a/modules/libjar/test/unit/test_bug370103.js +++ b/modules/libjar/test/unit/test_bug370103.js @@ -1,4 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); // Regression test for bug 370103 - crash when passing a null listener to diff --git a/modules/libjar/test/unit/test_bug589292.js b/modules/libjar/test/unit/test_bug589292.js index 313cc3cf6b5d..07b43d297338 100644 --- a/modules/libjar/test/unit/test_bug589292.js +++ b/modules/libjar/test/unit/test_bug589292.js @@ -1,6 +1,5 @@ // Make sure we behave appropriately when asking for content-disposition -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const path = "data/test_bug589292.zip"; diff --git a/modules/libjar/test/unit/test_bug597702.js b/modules/libjar/test/unit/test_bug597702.js index b7d08a099954..8514c593f17d 100644 --- a/modules/libjar/test/unit/test_bug597702.js +++ b/modules/libjar/test/unit/test_bug597702.js @@ -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 { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); // Check that reading non existant inner jars results in the right error diff --git a/modules/libjar/test/unit/test_bug637286.js b/modules/libjar/test/unit/test_bug637286.js index 34df98ecd30f..114e6b19f226 100644 --- a/modules/libjar/test/unit/test_bug637286.js +++ b/modules/libjar/test/unit/test_bug637286.js @@ -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 { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); // Check that the zip cache can expire entries from nested jars diff --git a/modules/libjar/test/unit/test_bug658093.js b/modules/libjar/test/unit/test_bug658093.js index 909afbd335a3..92b765477577 100644 --- a/modules/libjar/test/unit/test_bug658093.js +++ b/modules/libjar/test/unit/test_bug658093.js @@ -2,7 +2,6 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); // Check that we don't crash on reading a directory entry signature diff --git a/modules/libjar/test/unit/test_empty_jar_telemetry.js b/modules/libjar/test/unit/test_empty_jar_telemetry.js index a8ee8f242afb..7ac10c74fa8c 100644 --- a/modules/libjar/test/unit/test_empty_jar_telemetry.js +++ b/modules/libjar/test/unit/test_empty_jar_telemetry.js @@ -4,7 +4,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { TelemetryTestUtils } = ChromeUtils.import( diff --git a/modules/libjar/test/unit/test_jarchannel.js b/modules/libjar/test/unit/test_jarchannel.js index af1afc5f3caf..404899164ec8 100644 --- a/modules/libjar/test/unit/test_jarchannel.js +++ b/modules/libjar/test/unit/test_jarchannel.js @@ -8,7 +8,6 @@ const { Constructor: ctor } = Components; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const ios = Services.io; diff --git a/modules/libjar/test/unit/test_not_found.js b/modules/libjar/test/unit/test_not_found.js index 7e96e05fd8c0..90c298e64acf 100644 --- a/modules/libjar/test/unit/test_not_found.js +++ b/modules/libjar/test/unit/test_not_found.js @@ -1,6 +1,5 @@ // Should report file not found on non-existent files -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const path = "data/test_bug333423.zip"; diff --git a/modules/libjar/test/unit/test_umlaute.js b/modules/libjar/test/unit/test_umlaute.js index 7ef43c0d112d..93e43529cdb6 100644 --- a/modules/libjar/test/unit/test_umlaute.js +++ b/modules/libjar/test/unit/test_umlaute.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function run_test() { var tmpDir = Services.dirsvc.get("TmpD", Ci.nsIFile); diff --git a/modules/libjar/zipwriter/test/unit/head_zipwriter.js b/modules/libjar/zipwriter/test/unit/head_zipwriter.js index f12933d664ce..a3ec581f89a5 100644 --- a/modules/libjar/zipwriter/test/unit/head_zipwriter.js +++ b/modules/libjar/zipwriter/test/unit/head_zipwriter.js @@ -27,7 +27,6 @@ const PR_MSEC_PER_SEC = 1000; const DATA_DIR = "data/"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var ioSvc = Services.io; var ZipWriter = Components.Constructor( diff --git a/modules/libpref/test/unit/head_libPrefs.js b/modules/libpref/test/unit/head_libPrefs.js index d82d6b09bce9..ef7044a641c8 100644 --- a/modules/libpref/test/unit/head_libPrefs.js +++ b/modules/libpref/test/unit/head_libPrefs.js @@ -18,8 +18,6 @@ function do_check_throws(f, result, stack) { ok(false, "expected result " + result + ", none thrown"); } -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // Register current test directory as provider for the profile directory. var provider = { getFile(prop, persistent) { diff --git a/modules/libpref/test/unit/test_parsePrefs.js b/modules/libpref/test/unit/test_parsePrefs.js index 7bb42bd7c6eb..14e335bcec39 100644 --- a/modules/libpref/test/unit/test_parsePrefs.js +++ b/modules/libpref/test/unit/test_parsePrefs.js @@ -3,8 +3,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // // This undoes some of the configuration from // Services.dirsvc // .QueryInterface(Ci.nsIDirectoryService) diff --git a/modules/libpref/test/unit_ipc/test_existing_prefs.js b/modules/libpref/test/unit_ipc/test_existing_prefs.js index 78cfdcd1512a..4efce784b08a 100644 --- a/modules/libpref/test/unit_ipc/test_existing_prefs.js +++ b/modules/libpref/test/unit_ipc/test_existing_prefs.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function isParentProcess() { let appInfo = Cc["@mozilla.org/xre/app-info;1"]; return ( diff --git a/modules/libpref/test/unit_ipc/test_initial_prefs.js b/modules/libpref/test/unit_ipc/test_initial_prefs.js index 0fffd327beaa..9c5e8991cf31 100644 --- a/modules/libpref/test/unit_ipc/test_initial_prefs.js +++ b/modules/libpref/test/unit_ipc/test_initial_prefs.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function isParentProcess() { return Services.appinfo.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT; } diff --git a/modules/libpref/test/unit_ipc/test_large_pref.js b/modules/libpref/test/unit_ipc/test_large_pref.js index 4b4a50fcf048..79c1330c366d 100644 --- a/modules/libpref/test/unit_ipc/test_large_pref.js +++ b/modules/libpref/test/unit_ipc/test_large_pref.js @@ -6,7 +6,6 @@ // Non-string preferences are not tested here, because their behavior // should not be affected by this filtering. // -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function isParentProcess() { return Services.appinfo.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT; diff --git a/modules/libpref/test/unit_ipc/test_locked_prefs.js b/modules/libpref/test/unit_ipc/test_locked_prefs.js index 64dd15dd0dd1..037427e495d4 100644 --- a/modules/libpref/test/unit_ipc/test_locked_prefs.js +++ b/modules/libpref/test/unit_ipc/test_locked_prefs.js @@ -4,8 +4,6 @@ // Locked status should be communicated to children. -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function isParentProcess() { return Services.appinfo.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT; } diff --git a/modules/libpref/test/unit_ipc/test_observed_prefs.js b/modules/libpref/test/unit_ipc/test_observed_prefs.js index 6e451bbb74a0..9f6984d5555a 100644 --- a/modules/libpref/test/unit_ipc/test_observed_prefs.js +++ b/modules/libpref/test/unit_ipc/test_observed_prefs.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function isParentProcess() { return Services.appinfo.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT; } diff --git a/modules/libpref/test/unit_ipc/test_sharedMap.js b/modules/libpref/test/unit_ipc/test_sharedMap.js index d0dd30c5402c..886e6d6d4712 100644 --- a/modules/libpref/test/unit_ipc/test_sharedMap.js +++ b/modules/libpref/test/unit_ipc/test_sharedMap.js @@ -9,7 +9,6 @@ // process, and changes after that point are stored as entries in a dynamic hash // table, on top of the snapshot. -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCShellContentUtils } = ChromeUtils.import( "resource://testing-common/XPCShellContentUtils.jsm" ); diff --git a/modules/libpref/test/unit_ipc/test_sharedMap_static_prefs.js b/modules/libpref/test/unit_ipc/test_sharedMap_static_prefs.js index b9bc57d8c688..adf3da5394d4 100644 --- a/modules/libpref/test/unit_ipc/test_sharedMap_static_prefs.js +++ b/modules/libpref/test/unit_ipc/test_sharedMap_static_prefs.js @@ -25,7 +25,6 @@ const PREF1_VALUE = false; const PREF2_NAME = "dom.mutation-events.cssom.disabled"; const PREF2_VALUE = true; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCShellContentUtils } = ChromeUtils.import( "resource://testing-common/XPCShellContentUtils.jsm" ); diff --git a/modules/libpref/test/unit_ipc/test_update_prefs.js b/modules/libpref/test/unit_ipc/test_update_prefs.js index 741b690e008d..51e2c458c589 100644 --- a/modules/libpref/test/unit_ipc/test_update_prefs.js +++ b/modules/libpref/test/unit_ipc/test_update_prefs.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function isParentProcess() { return Services.appinfo.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT; } diff --git a/modules/libpref/test/unit_ipc/test_user_default_prefs.js b/modules/libpref/test/unit_ipc/test_user_default_prefs.js index 7821f34ecedf..ea8ff8be57e0 100644 --- a/modules/libpref/test/unit_ipc/test_user_default_prefs.js +++ b/modules/libpref/test/unit_ipc/test_user_default_prefs.js @@ -1,4 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const pb = Services.prefs; // This pref is chosen somewhat arbitrarily --- we just need one diff --git a/netwerk/cookie/test/unit/test_baseDomain_publicsuffix.js b/netwerk/cookie/test/unit/test_baseDomain_publicsuffix.js index 9d58c0669544..94f01b778e68 100644 --- a/netwerk/cookie/test/unit/test_baseDomain_publicsuffix.js +++ b/netwerk/cookie/test/unit/test_baseDomain_publicsuffix.js @@ -1,7 +1,5 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - add_task(async () => { const HOST = "www.bbc.co.uk"; Assert.equal( diff --git a/netwerk/cookie/test/unit/test_bug1155169.js b/netwerk/cookie/test/unit/test_bug1155169.js index 892ec6b0cc43..de2cd50ab61d 100644 --- a/netwerk/cookie/test/unit/test_bug1155169.js +++ b/netwerk/cookie/test/unit/test_bug1155169.js @@ -1,5 +1,4 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const URI = Services.io.newURI("http://example.org/"); diff --git a/netwerk/cookie/test/unit/test_bug1321912.js b/netwerk/cookie/test/unit/test_bug1321912.js index 46c9bf4a9fe8..5addb7590607 100644 --- a/netwerk/cookie/test/unit/test_bug1321912.js +++ b/netwerk/cookie/test/unit/test_bug1321912.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - do_get_profile(); const dirSvc = Services.dirsvc; diff --git a/netwerk/cookie/test/unit/test_bug643051.js b/netwerk/cookie/test/unit/test_bug643051.js index c62eeda47ba8..c95f9e589ef9 100644 --- a/netwerk/cookie/test/unit/test_bug643051.js +++ b/netwerk/cookie/test/unit/test_bug643051.js @@ -1,5 +1,4 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { CookieXPCShellUtils } = ChromeUtils.import( "resource://testing-common/CookieXPCShellUtils.jsm" ); diff --git a/netwerk/cookie/test/unit/test_eviction.js b/netwerk/cookie/test/unit/test_eviction.js index a30b1735770e..39c5bf9f378d 100644 --- a/netwerk/cookie/test/unit/test_eviction.js +++ b/netwerk/cookie/test/unit/test_eviction.js @@ -1,5 +1,4 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" diff --git a/netwerk/cookie/test/unit/test_getCookieSince.js b/netwerk/cookie/test/unit/test_getCookieSince.js index e88c13dbebe8..d2f1c6f5ffb7 100644 --- a/netwerk/cookie/test/unit/test_getCookieSince.js +++ b/netwerk/cookie/test/unit/test_getCookieSince.js @@ -1,5 +1,4 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function setCookie(name, url) { let value = `${name}=${Math.random()}; Path=/; Max-Age=1000; sameSite=none; Secure`; diff --git a/netwerk/cookie/test/unit/test_migrateCookieLifetimePref.js b/netwerk/cookie/test/unit/test_migrateCookieLifetimePref.js index bf659239841e..088a90970963 100644 --- a/netwerk/cookie/test/unit/test_migrateCookieLifetimePref.js +++ b/netwerk/cookie/test/unit/test_migrateCookieLifetimePref.js @@ -1,7 +1,6 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); /* Tests that - the migration code runs, diff --git a/netwerk/cookie/test/unit/test_parser_0001.js b/netwerk/cookie/test/unit/test_parser_0001.js index 0c2583b1a9f7..60a65b971817 100644 --- a/netwerk/cookie/test/unit/test_parser_0001.js +++ b/netwerk/cookie/test/unit/test_parser_0001.js @@ -1,5 +1,4 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function inChildProcess() { return Services.appinfo.processType != Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT; diff --git a/netwerk/cookie/test/unit/test_parser_0019.js b/netwerk/cookie/test/unit/test_parser_0019.js index 44aa71ce534a..f2c883cb32a2 100644 --- a/netwerk/cookie/test/unit/test_parser_0019.js +++ b/netwerk/cookie/test/unit/test_parser_0019.js @@ -1,5 +1,4 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function inChildProcess() { return Services.appinfo.processType != Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT; diff --git a/netwerk/cookie/test/unit/test_rawSameSite.js b/netwerk/cookie/test/unit/test_rawSameSite.js index facb214a291c..8cb8da9ac076 100644 --- a/netwerk/cookie/test/unit/test_rawSameSite.js +++ b/netwerk/cookie/test/unit/test_rawSameSite.js @@ -1,5 +1,4 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function inChildProcess() { return Services.appinfo.processType != Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT; diff --git a/netwerk/cookie/test/unit/test_schemeMap.js b/netwerk/cookie/test/unit/test_schemeMap.js index ef8f221ff5df..d8689c7a66e1 100644 --- a/netwerk/cookie/test/unit/test_schemeMap.js +++ b/netwerk/cookie/test/unit/test_schemeMap.js @@ -1,5 +1,4 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" diff --git a/netwerk/dns/tests/unit/test_PublicSuffixList.js b/netwerk/dns/tests/unit/test_PublicSuffixList.js index 2710d57fe41f..38f3e76b697a 100644 --- a/netwerk/dns/tests/unit/test_PublicSuffixList.js +++ b/netwerk/dns/tests/unit/test_PublicSuffixList.js @@ -10,8 +10,6 @@ const { TestUtils } = ChromeUtils.import( "resource://testing-common/TestUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const CLIENT = PublicSuffixList.CLIENT; const SIGNAL = "public-suffix-list-updated"; diff --git a/netwerk/dns/tests/unit/test_nsEffectiveTLDService_Reload_DAFSA.js b/netwerk/dns/tests/unit/test_nsEffectiveTLDService_Reload_DAFSA.js index 2758d2627f07..6b89b070d5df 100644 --- a/netwerk/dns/tests/unit/test_nsEffectiveTLDService_Reload_DAFSA.js +++ b/netwerk/dns/tests/unit/test_nsEffectiveTLDService_Reload_DAFSA.js @@ -3,8 +3,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const SIGNAL = "public-suffix-list-updated"; add_task(async () => { diff --git a/netwerk/dns/tests/unit/test_nsEffectiveTLDService_getKnownPublicSuffix.js b/netwerk/dns/tests/unit/test_nsEffectiveTLDService_getKnownPublicSuffix.js index 3d63fc29b434..333692af9782 100644 --- a/netwerk/dns/tests/unit/test_nsEffectiveTLDService_getKnownPublicSuffix.js +++ b/netwerk/dns/tests/unit/test_nsEffectiveTLDService_getKnownPublicSuffix.js @@ -7,8 +7,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - add_task(() => { for (let [suffix, isKnown] of [ ["", false], diff --git a/netwerk/dns/tests/unit/test_nsEffectiveTLDService_getSite.js b/netwerk/dns/tests/unit/test_nsEffectiveTLDService_getSite.js index 52bbb6c5e12c..5f6f3b1eb362 100644 --- a/netwerk/dns/tests/unit/test_nsEffectiveTLDService_getSite.js +++ b/netwerk/dns/tests/unit/test_nsEffectiveTLDService_getSite.js @@ -7,8 +7,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - add_task(() => { for (let [originString, result] of [ ["http://.", null], diff --git a/netwerk/test/mochitests/file_1331680.js b/netwerk/test/mochitests/file_1331680.js index c6cd8d1bb30e..9a6c45b82637 100644 --- a/netwerk/test/mochitests/file_1331680.js +++ b/netwerk/test/mochitests/file_1331680.js @@ -2,8 +2,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var observer = { observe(subject, topic, data) { if (topic == "cookie-changed") { diff --git a/netwerk/test/unit/head_cache.js b/netwerk/test/unit/head_cache.js index a51109c2d155..f15d05866b25 100644 --- a/netwerk/test/unit/head_cache.js +++ b/netwerk/test/unit/head_cache.js @@ -3,7 +3,6 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function evict_cache_entries(where) { var clearDisk = !where || where == "disk" || where == "all"; diff --git a/netwerk/test/unit/test_cacheflags.js b/netwerk/test/unit/test_cacheflags.js index 4c0ae215f557..33d47d9ea15a 100644 --- a/netwerk/test/unit/test_cacheflags.js +++ b/netwerk/test/unit/test_cacheflags.js @@ -1,7 +1,6 @@ "use strict"; const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var httpserver = new HttpServer(); httpserver.start(-1); diff --git a/netwerk/test/unit/test_http_sfv.js b/netwerk/test/unit/test_http_sfv.js index b183ba8a10c9..ea2f9392c73a 100644 --- a/netwerk/test/unit/test_http_sfv.js +++ b/netwerk/test/unit/test_http_sfv.js @@ -1,6 +1,5 @@ "use strict"; -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const gService = Cc["@mozilla.org/http-sfv-service;1"].getService( Ci.nsISFVService ); diff --git a/netwerk/test/unit/test_predictor.js b/netwerk/test/unit/test_predictor.js index ff4893123e17..672d58009690 100644 --- a/netwerk/test/unit/test_predictor.js +++ b/netwerk/test/unit/test_predictor.js @@ -1,7 +1,6 @@ "use strict"; const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const ReferrerInfo = Components.Constructor( "@mozilla.org/referrer-info;1", "nsIReferrerInfo", diff --git a/netwerk/test/unit/test_standardurl.js b/netwerk/test/unit/test_standardurl.js index 116636c2e34c..26d7212d08b1 100644 --- a/netwerk/test/unit/test_standardurl.js +++ b/netwerk/test/unit/test_standardurl.js @@ -1,6 +1,5 @@ "use strict"; -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const gPrefs = Services.prefs; function symmetricEquality(expect, a, b) { diff --git a/netwerk/test/unit/test_trackingProtection_annotateChannels.js b/netwerk/test/unit/test_trackingProtection_annotateChannels.js index 5c31b0b0efed..cbcc13cb4d7c 100644 --- a/netwerk/test/unit/test_trackingProtection_annotateChannels.js +++ b/netwerk/test/unit/test_trackingProtection_annotateChannels.js @@ -4,7 +4,6 @@ const { UrlClassifierTestUtils } = ChromeUtils.import( "resource://testing-common/UrlClassifierTestUtils.jsm" ); const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); // This test supports both e10s and non-e10s mode. In non-e10s mode, this test // drives itself by creating a profile directory, setting up the URL classifier diff --git a/netwerk/test/unit/test_trr_httpssvc.js b/netwerk/test/unit/test_trr_httpssvc.js index 6e594d4ddaa5..7bc4a82f0fb2 100644 --- a/netwerk/test/unit/test_trr_httpssvc.js +++ b/netwerk/test/unit/test_trr_httpssvc.js @@ -5,7 +5,6 @@ "use strict"; ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { TestUtils } = ChromeUtils.import( "resource://testing-common/TestUtils.jsm" ); diff --git a/netwerk/test/unit_ipc/head_http3_clone.js b/netwerk/test/unit_ipc/head_http3_clone.js index ca5663c38ab7..973eb6ef22c5 100644 --- a/netwerk/test/unit_ipc/head_http3_clone.js +++ b/netwerk/test/unit_ipc/head_http3_clone.js @@ -1,6 +1,5 @@ /* import-globals-from ../unit/head_http3.js */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" diff --git a/netwerk/test/unit_ipc/head_trr_clone.js b/netwerk/test/unit_ipc/head_trr_clone.js index 2f9a60d0a91d..deb6b8781111 100644 --- a/netwerk/test/unit_ipc/head_trr_clone.js +++ b/netwerk/test/unit_ipc/head_trr_clone.js @@ -1,6 +1,5 @@ /* import-globals-from ../unit/head_trr.js */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" diff --git a/remote/marionette/accessibility.js b/remote/marionette/accessibility.js index a3a311b26add..bc0e50b0e5b3 100644 --- a/remote/marionette/accessibility.js +++ b/remote/marionette/accessibility.js @@ -6,7 +6,6 @@ const EXPORTED_SYMBOLS = ["accessibility"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/remote/marionette/appinfo.js b/remote/marionette/appinfo.js index 494b39b22f02..e086a9b067eb 100644 --- a/remote/marionette/appinfo.js +++ b/remote/marionette/appinfo.js @@ -6,7 +6,6 @@ const EXPORTED_SYMBOLS = ["AppInfo"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/remote/marionette/cookie.js b/remote/marionette/cookie.js index d6637b4d4a39..93918f6248dd 100644 --- a/remote/marionette/cookie.js +++ b/remote/marionette/cookie.js @@ -6,7 +6,6 @@ const EXPORTED_SYMBOLS = ["cookie"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/remote/marionette/driver.js b/remote/marionette/driver.js index f118decbe56b..e5ad5046d64e 100644 --- a/remote/marionette/driver.js +++ b/remote/marionette/driver.js @@ -6,7 +6,6 @@ const EXPORTED_SYMBOLS = ["GeckoDriver"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/remote/marionette/element.js b/remote/marionette/element.js index 2b0bfe75ec00..eaad5775f921 100644 --- a/remote/marionette/element.js +++ b/remote/marionette/element.js @@ -13,7 +13,6 @@ const EXPORTED_SYMBOLS = [ "WebWindow", ]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/remote/marionette/event.js b/remote/marionette/event.js index 9fbc2cae6443..60f114fde583 100644 --- a/remote/marionette/event.js +++ b/remote/marionette/event.js @@ -7,7 +7,6 @@ const EXPORTED_SYMBOLS = ["event"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/remote/marionette/l10n.js b/remote/marionette/l10n.js index c33e0dee2602..781b3ef26cf8 100644 --- a/remote/marionette/l10n.js +++ b/remote/marionette/l10n.js @@ -17,7 +17,6 @@ const EXPORTED_SYMBOLS = ["l10n"]; * content retrieved. */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/remote/marionette/modal.js b/remote/marionette/modal.js index 9e34f7495b43..7d3414d59e24 100644 --- a/remote/marionette/modal.js +++ b/remote/marionette/modal.js @@ -6,7 +6,6 @@ const EXPORTED_SYMBOLS = ["modal"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/remote/marionette/navigate.js b/remote/marionette/navigate.js index 0b91e2952987..b681800a22e0 100644 --- a/remote/marionette/navigate.js +++ b/remote/marionette/navigate.js @@ -6,7 +6,6 @@ const EXPORTED_SYMBOLS = ["navigate"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/remote/marionette/permissions.js b/remote/marionette/permissions.js index 83393b7d78aa..8e825d6dcb92 100644 --- a/remote/marionette/permissions.js +++ b/remote/marionette/permissions.js @@ -6,7 +6,6 @@ const EXPORTED_SYMBOLS = ["permissions"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/remote/marionette/prefs.js b/remote/marionette/prefs.js index bd570e1fc430..b46b01716e71 100644 --- a/remote/marionette/prefs.js +++ b/remote/marionette/prefs.js @@ -6,7 +6,6 @@ const EXPORTED_SYMBOLS = ["Branch", "EnvironmentPrefs", "MarionettePrefs"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/remote/marionette/reftest.js b/remote/marionette/reftest.js index c787411d3be7..5e9b6dac1820 100644 --- a/remote/marionette/reftest.js +++ b/remote/marionette/reftest.js @@ -6,7 +6,6 @@ const EXPORTED_SYMBOLS = ["reftest"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/remote/marionette/stream-utils.js b/remote/marionette/stream-utils.js index 1d61b27d3bbd..d6358be1df9b 100644 --- a/remote/marionette/stream-utils.js +++ b/remote/marionette/stream-utils.js @@ -6,7 +6,6 @@ const EXPORTED_SYMBOLS = ["StreamUtils"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/remote/marionette/sync.js b/remote/marionette/sync.js index 6d8372f9e1fc..9ccded62cd70 100644 --- a/remote/marionette/sync.js +++ b/remote/marionette/sync.js @@ -19,7 +19,6 @@ const EXPORTED_SYMBOLS = [ 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/remote/marionette/test/xpcshell/test_modal.js b/remote/marionette/test/xpcshell/test_modal.js index 441f0250e03d..276c820d093a 100644 --- a/remote/marionette/test/xpcshell/test_modal.js +++ b/remote/marionette/test/xpcshell/test_modal.js @@ -4,7 +4,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { modal } = ChromeUtils.import( "chrome://remote/content/marionette/modal.js" ); diff --git a/remote/marionette/test/xpcshell/test_prefs.js b/remote/marionette/test/xpcshell/test_prefs.js index 42b4425c7de6..48f15e1045da 100644 --- a/remote/marionette/test/xpcshell/test_prefs.js +++ b/remote/marionette/test/xpcshell/test_prefs.js @@ -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/marionette/test/xpcshell/test_sync.js b/remote/marionette/test/xpcshell/test_sync.js index e22fcc4e3dac..9fc3abcd4033 100644 --- a/remote/marionette/test/xpcshell/test_sync.js +++ b/remote/marionette/test/xpcshell/test_sync.js @@ -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 { DebounceCallback, IdlePromise, diff --git a/remote/shared/test/xpcshell/test_Navigate.js b/remote/shared/test/xpcshell/test_Navigate.js index 9eb717e3946b..b10eee77afe7 100644 --- a/remote/shared/test/xpcshell/test_Navigate.js +++ b/remote/shared/test/xpcshell/test_Navigate.js @@ -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"); const { diff --git a/remote/shared/test/xpcshell/test_RecommendedPreferences.js b/remote/shared/test/xpcshell/test_RecommendedPreferences.js index a6ed65477f46..05cbfdcdbe0a 100644 --- a/remote/shared/test/xpcshell/test_RecommendedPreferences.js +++ b/remote/shared/test/xpcshell/test_RecommendedPreferences.js @@ -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 { RecommendedPreferences } = ChromeUtils.import( "chrome://remote/content/shared/RecommendedPreferences.jsm" ); diff --git a/security/manager/pki/resources/content/changepassword.js b/security/manager/pki/resources/content/changepassword.js index 10cbf9f16273..16ffdadb9dd3 100644 --- a/security/manager/pki/resources/content/changepassword.js +++ b/security/manager/pki/resources/content/changepassword.js @@ -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/security/manager/pki/resources/content/device_manager.js b/security/manager/pki/resources/content/device_manager.js index 42fa86af4941..d2ee236a391d 100644 --- a/security/manager/pki/resources/content/device_manager.js +++ b/security/manager/pki/resources/content/device_manager.js @@ -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/security/manager/pki/resources/content/pippki.js b/security/manager/pki/resources/content/pippki.js index f47e94f7fd70..4e3ebbaffa0a 100644 --- a/security/manager/pki/resources/content/pippki.js +++ b/security/manager/pki/resources/content/pippki.js @@ -10,8 +10,6 @@ * pippki UI js files. */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - ChromeUtils.defineModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm"); function setText(id, value) { diff --git a/security/manager/ssl/tests/unit/head_psm.js b/security/manager/ssl/tests/unit/head_psm.js index 45f90ea5e4ca..15309e248c10 100644 --- a/security/manager/ssl/tests/unit/head_psm.js +++ b/security/manager/ssl/tests/unit/head_psm.js @@ -19,7 +19,6 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); 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/security/manager/tools/dumpGoogleRoots.js b/security/manager/tools/dumpGoogleRoots.js index 8585c9076130..e74406131255 100644 --- a/security/manager/tools/dumpGoogleRoots.js +++ b/security/manager/tools/dumpGoogleRoots.js @@ -13,8 +13,6 @@ // 4. [paste the output into the appropriate section in // security/manager/tools/PreloadedHPKPins.json] -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - Services.prefs.setBoolPref("network.process.enabled", false); function downloadRoots() { diff --git a/security/manager/tools/genRootCAHashes.js b/security/manager/tools/genRootCAHashes.js index 89d6d3d698b4..e85625a6279e 100644 --- a/security/manager/tools/genRootCAHashes.js +++ b/security/manager/tools/genRootCAHashes.js @@ -19,7 +19,6 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { CommonUtils } = ChromeUtils.import( "resource://services-common/utils.js" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const FILENAME_OUTPUT = "RootHashes.inc"; const FILENAME_TRUST_ANCHORS = "KnownRootHashes.json"; diff --git a/services/common/async.js b/services/common/async.js index 42bfb72a26eb..843655bd0d51 100644 --- a/services/common/async.js +++ b/services/common/async.js @@ -4,8 +4,6 @@ var EXPORTED_SYMBOLS = ["Async"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const Timer = Components.Constructor("@mozilla.org/timer;1", "nsITimer"); /* diff --git a/services/common/hawkclient.js b/services/common/hawkclient.js index 2407c750abd9..6957f92d2bc4 100644 --- a/services/common/hawkclient.js +++ b/services/common/hawkclient.js @@ -36,7 +36,6 @@ const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); // log.appender.dump should be one of "Fatal", "Error", "Warn", "Info", "Config", // "Debug", "Trace" or "All". If none is specified, "Error" will be used by diff --git a/services/common/hawkrequest.js b/services/common/hawkrequest.js index a433824b9558..8a411deac071 100644 --- a/services/common/hawkrequest.js +++ b/services/common/hawkrequest.js @@ -12,7 +12,6 @@ var EXPORTED_SYMBOLS = [ const { Preferences } = ChromeUtils.import( "resource://gre/modules/Preferences.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); const { RESTRequest } = ChromeUtils.import( "resource://services-common/rest.js" diff --git a/services/common/logmanager.js b/services/common/logmanager.js index f49e858f49fa..e5ce91f8734b 100644 --- a/services/common/logmanager.js +++ b/services/common/logmanager.js @@ -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/services/common/observers.js b/services/common/observers.js index 22fcca48b40c..2ccceb1522cd 100644 --- a/services/common/observers.js +++ b/services/common/observers.js @@ -4,8 +4,6 @@ var EXPORTED_SYMBOLS = ["Observers"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - /** * A service for adding, removing and notifying observers of notifications. * Wraps the nsIObserverService interface. diff --git a/services/common/rest.js b/services/common/rest.js index d73d4155dedf..c44aeb254b33 100644 --- a/services/common/rest.js +++ b/services/common/rest.js @@ -8,7 +8,6 @@ var EXPORTED_SYMBOLS = [ "TokenAuthenticatedRESTRequest", ]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); const { PromiseUtils } = ChromeUtils.import( diff --git a/services/common/tests/unit/test_hawkrequest.js b/services/common/tests/unit/test_hawkrequest.js index aebed6d8d552..3dddfabb46aa 100644 --- a/services/common/tests/unit/test_hawkrequest.js +++ b/services/common/tests/unit/test_hawkrequest.js @@ -7,7 +7,6 @@ const { HAWKAuthenticatedRESTRequest, deriveHawkCredentials, } = ChromeUtils.import("resource://services-common/hawkrequest.js"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { Async } = ChromeUtils.import("resource://services-common/async.js"); // https://github.com/mozilla/fxa-auth-server/wiki/onepw-protocol#wiki-use-session-certificatesign-etc diff --git a/services/common/tests/unit/test_logmanager.js b/services/common/tests/unit/test_logmanager.js index c96259a90aae..c1da01977d50 100644 --- a/services/common/tests/unit/test_logmanager.js +++ b/services/common/tests/unit/test_logmanager.js @@ -10,7 +10,6 @@ const { LogManager } = ChromeUtils.import( const { FileUtils } = ChromeUtils.import( "resource://gre/modules/FileUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); // Returns an array of [consoleAppender, dumpAppender, [fileAppenders]] for // the specified log. Note that fileAppenders will usually have length=1 diff --git a/services/common/tests/unit/test_restrequest.js b/services/common/tests/unit/test_restrequest.js index 0daa0c6ab7ad..15b15c0fd102 100644 --- a/services/common/tests/unit/test_restrequest.js +++ b/services/common/tests/unit/test_restrequest.js @@ -3,8 +3,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const { RESTRequest } = ChromeUtils.import( "resource://services-common/rest.js" ); diff --git a/services/common/tests/unit/test_storage_adapter_shutdown.js b/services/common/tests/unit/test_storage_adapter_shutdown.js index 10750818ee85..0b7dca8b06c1 100644 --- a/services/common/tests/unit/test_storage_adapter_shutdown.js +++ b/services/common/tests/unit/test_storage_adapter_shutdown.js @@ -1,7 +1,6 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { AsyncShutdown } = ChromeUtils.import( "resource://gre/modules/AsyncShutdown.jsm" ); diff --git a/services/common/uptake-telemetry.js b/services/common/uptake-telemetry.js index 3013435e29dc..d67cee0f1acf 100644 --- a/services/common/uptake-telemetry.js +++ b/services/common/uptake-telemetry.js @@ -18,7 +18,6 @@ ChromeUtils.defineModuleGetter( "ClientID", "resource://gre/modules/ClientID.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyGetter(lazy, "CryptoHash", () => { return Components.Constructor( diff --git a/services/common/utils.js b/services/common/utils.js index 284e5d0495c9..9ac617a12f93 100644 --- a/services/common/utils.js +++ b/services/common/utils.js @@ -4,7 +4,6 @@ var EXPORTED_SYMBOLS = ["CommonUtils"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/services/crypto/modules/WeaveCrypto.js b/services/crypto/modules/WeaveCrypto.js index 38956b42e03b..3ce551ed2ad4 100644 --- a/services/crypto/modules/WeaveCrypto.js +++ b/services/crypto/modules/WeaveCrypto.js @@ -7,7 +7,6 @@ var EXPORTED_SYMBOLS = ["WeaveCrypto"]; const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const CRYPT_ALGO = "AES-CBC"; const CRYPT_ALGO_LENGTH = 256; diff --git a/services/crypto/tests/unit/test_jwcrypto.js b/services/crypto/tests/unit/test_jwcrypto.js index 45722b86eb43..de97b30289e3 100644 --- a/services/crypto/tests/unit/test_jwcrypto.js +++ b/services/crypto/tests/unit/test_jwcrypto.js @@ -3,8 +3,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - ChromeUtils.defineModuleGetter( this, "jwcrypto", diff --git a/services/fxaccounts/FxAccountsCommands.js b/services/fxaccounts/FxAccountsCommands.js index 1d9ac66fb6af..2cfff1ab2bfb 100644 --- a/services/fxaccounts/FxAccountsCommands.js +++ b/services/fxaccounts/FxAccountsCommands.js @@ -16,7 +16,6 @@ ChromeUtils.defineModuleGetter( "PushCrypto", "resource://gre/modules/PushCrypto.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/services/fxaccounts/FxAccountsCommon.js b/services/fxaccounts/FxAccountsCommon.js index 1fdc27b65b9a..4cd56ae54a22 100644 --- a/services/fxaccounts/FxAccountsCommon.js +++ b/services/fxaccounts/FxAccountsCommon.js @@ -5,7 +5,6 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { Preferences } = ChromeUtils.import( "resource://gre/modules/Preferences.jsm" ); diff --git a/services/fxaccounts/tests/xpcshell/head.js b/services/fxaccounts/tests/xpcshell/head.js index 0f4b9e051f6a..792213193dc4 100644 --- a/services/fxaccounts/tests/xpcshell/head.js +++ b/services/fxaccounts/tests/xpcshell/head.js @@ -6,7 +6,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/services/settings/remote-settings.js b/services/settings/remote-settings.js index bfe9226f8826..a38c4ed172a1 100644 --- a/services/settings/remote-settings.js +++ b/services/settings/remote-settings.js @@ -12,7 +12,6 @@ var EXPORTED_SYMBOLS = [ "remoteSettingsBroadcastHandler", ]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/services/settings/test/unit/test_attachments_downloader.js b/services/settings/test/unit/test_attachments_downloader.js index 3f67e1f544c5..a72dd9c2c38b 100644 --- a/services/settings/test/unit/test_attachments_downloader.js +++ b/services/settings/test/unit/test_attachments_downloader.js @@ -1,6 +1,5 @@ /* import-globals-from ../../../common/tests/unit/head_helpers.js */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { RemoteSettings } = ChromeUtils.import( "resource://services-settings/remote-settings.js" ); diff --git a/services/settings/test/unit/test_remote_settings.js b/services/settings/test/unit/test_remote_settings.js index b407ef7a5ded..f3f02d1dce34 100644 --- a/services/settings/test/unit/test_remote_settings.js +++ b/services/settings/test/unit/test_remote_settings.js @@ -1,6 +1,5 @@ /* import-globals-from ../../../common/tests/unit/head_helpers.js */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); diff --git a/services/settings/test/unit/test_remote_settings_jexl_filters.js b/services/settings/test/unit/test_remote_settings_jexl_filters.js index 93daf2f8fb60..c08bfe0b7955 100644 --- a/services/settings/test/unit/test_remote_settings_jexl_filters.js +++ b/services/settings/test/unit/test_remote_settings_jexl_filters.js @@ -1,4 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { RemoteSettings } = ChromeUtils.import( "resource://services-settings/remote-settings.js" ); diff --git a/services/settings/test/unit/test_remote_settings_poll.js b/services/settings/test/unit/test_remote_settings_poll.js index 4ab2adb32d95..96dd0ad8846c 100644 --- a/services/settings/test/unit/test_remote_settings_poll.js +++ b/services/settings/test/unit/test_remote_settings_poll.js @@ -3,7 +3,6 @@ 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 { UptakeTelemetry, Policy } = ChromeUtils.import( diff --git a/services/settings/test/unit/test_remote_settings_recover_broken.js b/services/settings/test/unit/test_remote_settings_recover_broken.js index 92bc0adeb5e4..09ad08a17594 100644 --- a/services/settings/test/unit/test_remote_settings_recover_broken.js +++ b/services/settings/test/unit/test_remote_settings_recover_broken.js @@ -1,7 +1,5 @@ /* import-globals-from ../../../common/tests/unit/head_helpers.js */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const { SyncHistory } = ChromeUtils.import( "resource://services-settings/SyncHistory.jsm" ); diff --git a/services/settings/test/unit/test_remote_settings_release_prefs.js b/services/settings/test/unit/test_remote_settings_release_prefs.js index b77871b5ea7d..aba44a9b1b65 100644 --- a/services/settings/test/unit/test_remote_settings_release_prefs.js +++ b/services/settings/test/unit/test_remote_settings_release_prefs.js @@ -1,6 +1,5 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); diff --git a/services/settings/test/unit/test_remote_settings_signatures.js b/services/settings/test/unit/test_remote_settings_signatures.js index eb74ff8b04e4..236dac929db3 100644 --- a/services/settings/test/unit/test_remote_settings_signatures.js +++ b/services/settings/test/unit/test_remote_settings_signatures.js @@ -1,8 +1,6 @@ /* import-globals-from ../../../common/tests/unit/head_helpers.js */ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const { RemoteSettings } = ChromeUtils.import( "resource://services-settings/remote-settings.js" ); diff --git a/services/settings/test/unit/test_remote_settings_utils.js b/services/settings/test/unit/test_remote_settings_utils.js index 8cc5001cf7d8..4713d22ca2b6 100644 --- a/services/settings/test/unit/test_remote_settings_utils.js +++ b/services/settings/test/unit/test_remote_settings_utils.js @@ -3,7 +3,6 @@ const { TestUtils } = ChromeUtils.import( "resource://testing-common/TestUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { Utils } = ChromeUtils.import("resource://services-settings/Utils.jsm"); const BinaryOutputStream = Components.Constructor( diff --git a/services/settings/test/unit/test_remote_settings_utils_telemetry.js b/services/settings/test/unit/test_remote_settings_utils_telemetry.js index 5d617c9d40cd..6315cbb56b77 100644 --- a/services/settings/test/unit/test_remote_settings_utils_telemetry.js +++ b/services/settings/test/unit/test_remote_settings_utils_telemetry.js @@ -5,7 +5,6 @@ /* import-globals-from ../../../common/tests/unit/head_helpers.js */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { TelemetryController } = ChromeUtils.import( "resource://gre/modules/TelemetryController.jsm" ); diff --git a/services/settings/test/unit/test_remote_settings_worker.js b/services/settings/test/unit/test_remote_settings_worker.js index 71d0f2216ba6..d3b14bc3edda 100644 --- a/services/settings/test/unit/test_remote_settings_worker.js +++ b/services/settings/test/unit/test_remote_settings_worker.js @@ -3,7 +3,6 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { TestUtils } = ChromeUtils.import( "resource://testing-common/TestUtils.jsm" ); diff --git a/services/settings/test/unit/test_shutdown_handling.js b/services/settings/test/unit/test_shutdown_handling.js index efaedd304877..31192950485f 100644 --- a/services/settings/test/unit/test_shutdown_handling.js +++ b/services/settings/test/unit/test_shutdown_handling.js @@ -3,8 +3,6 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const { TestUtils } = ChromeUtils.import( "resource://testing-common/TestUtils.jsm" ); diff --git a/services/sync/modules-testing/utils.js b/services/sync/modules-testing/utils.js index f7fd1d3839ef..3ee8d1462c21 100644 --- a/services/sync/modules-testing/utils.js +++ b/services/sync/modules-testing/utils.js @@ -47,7 +47,6 @@ const { FxAccountsClient } = ChromeUtils.import( const { SCOPE_OLD_SYNC, LEGACY_SCOPE_WEBEXT_SYNC } = ChromeUtils.import( "resource://gre/modules/FxAccountsCommon.js" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); // and grab non-exported stuff via a backstage pass. const { AccountState } = ChromeUtils.import( diff --git a/services/sync/modules/addonutils.js b/services/sync/modules/addonutils.js index cd07dba74a2f..cc0e1293b677 100644 --- a/services/sync/modules/addonutils.js +++ b/services/sync/modules/addonutils.js @@ -11,7 +11,6 @@ const { XPCOMUtils } = ChromeUtils.import( ); const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); const { Svc } = ChromeUtils.import("resource://services-sync/util.js"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const lazy = {}; diff --git a/services/sync/modules/doctor.js b/services/sync/modules/doctor.js index bb7864c47ad4..41f3c9acea62 100644 --- a/services/sync/modules/doctor.js +++ b/services/sync/modules/doctor.js @@ -11,7 +11,6 @@ var EXPORTED_SYMBOLS = ["Doctor"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); const { Async } = ChromeUtils.import("resource://services-common/async.js"); const { Observers } = ChromeUtils.import( diff --git a/services/sync/modules/engines/addons.js b/services/sync/modules/engines/addons.js index 71f0b5410164..99ebb1b9bb32 100644 --- a/services/sync/modules/engines/addons.js +++ b/services/sync/modules/engines/addons.js @@ -36,7 +36,6 @@ */ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { Preferences } = ChromeUtils.import( "resource://gre/modules/Preferences.jsm" ); diff --git a/services/sync/modules/engines/bookmarks.js b/services/sync/modules/engines/bookmarks.js index ea9f702f00c3..ead67e6c0ed2 100644 --- a/services/sync/modules/engines/bookmarks.js +++ b/services/sync/modules/engines/bookmarks.js @@ -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 { Async } = ChromeUtils.import("resource://services-common/async.js"); const { SCORE_INCREMENT_XLARGE } = ChromeUtils.import( "resource://services-sync/constants.js" diff --git a/services/sync/modules/engines/clients.js b/services/sync/modules/engines/clients.js index f4b18b528e2d..15e9d348fdee 100644 --- a/services/sync/modules/engines/clients.js +++ b/services/sync/modules/engines/clients.js @@ -22,7 +22,6 @@ var EXPORTED_SYMBOLS = ["ClientEngine", "ClientsRec"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { Async } = ChromeUtils.import("resource://services-common/async.js"); const { DEVICE_TYPE_DESKTOP, diff --git a/services/sync/modules/engines/passwords.js b/services/sync/modules/engines/passwords.js index 44a53de15f3c..74fda5ceebea 100644 --- a/services/sync/modules/engines/passwords.js +++ b/services/sync/modules/engines/passwords.js @@ -4,7 +4,6 @@ var EXPORTED_SYMBOLS = ["PasswordEngine", "LoginRec", "PasswordValidator"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { Collection, CryptoWrapper } = ChromeUtils.import( "resource://services-sync/record.js" ); diff --git a/services/sync/modules/engines/prefs.js b/services/sync/modules/engines/prefs.js index 4e492b1a6419..13891ef3039f 100644 --- a/services/sync/modules/engines/prefs.js +++ b/services/sync/modules/engines/prefs.js @@ -30,7 +30,6 @@ const PREF_SYNC_SEEN_PREFIX = "services.sync.prefs.sync-seen."; const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { Preferences } = ChromeUtils.import( "resource://gre/modules/Preferences.jsm" ); diff --git a/services/sync/modules/engines/tabs.js b/services/sync/modules/engines/tabs.js index 3669ba017460..2aa287f7093e 100644 --- a/services/sync/modules/engines/tabs.js +++ b/services/sync/modules/engines/tabs.js @@ -13,7 +13,6 @@ const { XPCOMUtils } = ChromeUtils.import( const { TabStateFlusher } = ChromeUtils.import( "resource:///modules/sessionstore/TabStateFlusher.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); const { Store, SyncEngine, Tracker } = ChromeUtils.import( "resource://services-sync/engines.js" diff --git a/services/sync/modules/policies.js b/services/sync/modules/policies.js index b7211d344668..921cc6992007 100644 --- a/services/sync/modules/policies.js +++ b/services/sync/modules/policies.js @@ -7,7 +7,6 @@ var EXPORTED_SYMBOLS = ["ErrorHandler", "SyncScheduler"]; 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 { CREDENTIALS_CHANGED, diff --git a/services/sync/modules/service.js b/services/sync/modules/service.js index be972c215ade..4e04e6af1c05 100644 --- a/services/sync/modules/service.js +++ b/services/sync/modules/service.js @@ -16,7 +16,6 @@ const KEYS_WBO = "keys"; 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 { Async } = ChromeUtils.import("resource://services-common/async.js"); const { CommonUtils } = ChromeUtils.import( diff --git a/services/sync/modules/sync_auth.js b/services/sync/modules/sync_auth.js index 20b6e4627f5f..c09bdbf521b3 100644 --- a/services/sync/modules/sync_auth.js +++ b/services/sync/modules/sync_auth.js @@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["SyncAuthManager", "AuthenticationError"]; 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 { Async } = ChromeUtils.import("resource://services-common/async.js"); const { TokenServerClient } = ChromeUtils.import( diff --git a/services/sync/modules/telemetry.js b/services/sync/modules/telemetry.js index 188a75593129..65f292ab3ff9 100644 --- a/services/sync/modules/telemetry.js +++ b/services/sync/modules/telemetry.js @@ -23,7 +23,6 @@ var EXPORTED_SYMBOLS = [ 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/services/sync/modules/util.js b/services/sync/modules/util.js index 2841d8e2fde7..54766893948c 100644 --- a/services/sync/modules/util.js +++ b/services/sync/modules/util.js @@ -24,7 +24,6 @@ const { const { Preferences } = ChromeUtils.import( "resource://gre/modules/Preferences.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/services/sync/tests/unit/head_appinfo.js b/services/sync/tests/unit/head_appinfo.js index 14503f1552e1..8fc9e41ce64d 100644 --- a/services/sync/tests/unit/head_appinfo.js +++ b/services/sync/tests/unit/head_appinfo.js @@ -3,7 +3,6 @@ /* import-globals-from ../../../common/tests/unit/head_helpers.js */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/services/sync/tps/extensions/tps/resource/quit.js b/services/sync/tps/extensions/tps/resource/quit.js index c5219fa5a18e..30bb635d3c25 100644 --- a/services/sync/tps/extensions/tps/resource/quit.js +++ b/services/sync/tps/extensions/tps/resource/quit.js @@ -9,8 +9,6 @@ */ var EXPORTED_SYMBOLS = ["goQuitApplication"]; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function canQuitApplication() { try { var cancelQuit = Cc["@mozilla.org/supports-PRBool;1"].createInstance( diff --git a/storage/test/unit/head_storage.js b/storage/test/unit/head_storage.js index 0f1e44ba2b29..66ac8a8cd216 100644 --- a/storage/test/unit/head_storage.js +++ b/storage/test/unit/head_storage.js @@ -5,7 +5,6 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); diff --git a/taskcluster/docker/periodic-updates/scripts/genHPKPStaticPins.js b/taskcluster/docker/periodic-updates/scripts/genHPKPStaticPins.js index dcf0d80868a2..830abc2af052 100644 --- a/taskcluster/docker/periodic-updates/scripts/genHPKPStaticPins.js +++ b/taskcluster/docker/periodic-updates/scripts/genHPKPStaticPins.js @@ -21,7 +21,6 @@ if (arguments.length != 2) { var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm"); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var gCertDB = Cc["@mozilla.org/security/x509certdb;1"].getService( Ci.nsIX509CertDB diff --git a/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js b/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js index dab503bfa289..c11a01ce58ee 100644 --- a/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js +++ b/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js @@ -12,7 +12,6 @@ var gSSService = Cc["@mozilla.org/ssservice;1"].getService( Ci.nsISiteSecurityService ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { FileUtils } = ChromeUtils.import( "resource://gre/modules/FileUtils.jsm" ); diff --git a/testing/mochitest/BrowserTestUtils/content/content-about-page-utils.js b/testing/mochitest/BrowserTestUtils/content/content-about-page-utils.js index 6c63fc629b74..4ce8b52e1430 100644 --- a/testing/mochitest/BrowserTestUtils/content/content-about-page-utils.js +++ b/testing/mochitest/BrowserTestUtils/content/content-about-page-utils.js @@ -4,8 +4,6 @@ var Cm = Components.manager; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function AboutPage(aboutHost, chromeURL, uriFlags) { this.chromeURL = chromeURL; this.aboutHost = aboutHost; diff --git a/testing/mochitest/BrowserTestUtils/content/content-task.js b/testing/mochitest/BrowserTestUtils/content/content-task.js index a755fa21e23b..a4f6b4984799 100644 --- a/testing/mochitest/BrowserTestUtils/content/content-task.js +++ b/testing/mochitest/BrowserTestUtils/content/content-task.js @@ -9,7 +9,6 @@ let { ContentTaskUtils } = ChromeUtils.import( "resource://testing-common/ContentTaskUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { Assert: AssertCls } = ChromeUtils.import( "resource://testing-common/Assert.jsm" ); diff --git a/testing/mochitest/browser-test.js b/testing/mochitest/browser-test.js index bf03c6de34d2..ee19432f19c1 100644 --- a/testing/mochitest/browser-test.js +++ b/testing/mochitest/browser-test.js @@ -11,7 +11,6 @@ var gConfig; var { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.defineModuleGetter( this, diff --git a/testing/mochitest/chrome-harness.js b/testing/mochitest/chrome-harness.js index a36ce38752fe..d9827fa50323 100644 --- a/testing/mochitest/chrome-harness.js +++ b/testing/mochitest/chrome-harness.js @@ -4,7 +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/. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); /* import-globals-from manifestLibrary.js */ diff --git a/testing/mochitest/tests/Harness_sanity/specialPowers_framescript.js b/testing/mochitest/tests/Harness_sanity/specialPowers_framescript.js index 314b3cdf1f29..e8e6c283a0e5 100644 --- a/testing/mochitest/tests/Harness_sanity/specialPowers_framescript.js +++ b/testing/mochitest/tests/Harness_sanity/specialPowers_framescript.js @@ -1,7 +1,5 @@ /* eslint-env mozilla/frame-script */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var permChangedObs = { observe(subject, topic, data) { if (topic == "perm-changed") { diff --git a/testing/talos/talos/bootstrap.js b/testing/talos/talos/bootstrap.js index a76462db2477..312cae66b9d4 100644 --- a/testing/talos/talos/bootstrap.js +++ b/testing/talos/talos/bootstrap.js @@ -19,7 +19,6 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const windowTracker = { init() { diff --git a/testing/talos/talos/pageloader/chrome/MozillaFileLogger.js b/testing/talos/talos/pageloader/chrome/MozillaFileLogger.js index f38cf960f486..65338ee19eab 100644 --- a/testing/talos/talos/pageloader/chrome/MozillaFileLogger.js +++ b/testing/talos/talos/pageloader/chrome/MozillaFileLogger.js @@ -6,8 +6,6 @@ * MozillaFileLogger, a log listener that can write to a local file. */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // double logging to account for normal mode and ipc mode (mobile_profile only) // Ideally we would remove the dump() and just do ipc logging function dumpLog(msg) { diff --git a/testing/talos/talos/tests/tabswitch/content/tabswitch-content-process.js b/testing/talos/talos/tests/tabswitch/content/tabswitch-content-process.js index c887b4f06832..a5149f1ef43f 100644 --- a/testing/talos/talos/tests/tabswitch/content/tabswitch-content-process.js +++ b/testing/talos/talos/tests/tabswitch/content/tabswitch-content-process.js @@ -1,4 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { ComponentUtils } = ChromeUtils.import( "resource://gre/modules/ComponentUtils.jsm" ); diff --git a/testing/xpcshell/example/unit/check_profile.js b/testing/xpcshell/example/unit/check_profile.js index 0529fd9832e4..57ecf5fd5534 100644 --- a/testing/xpcshell/example/unit/check_profile.js +++ b/testing/xpcshell/example/unit/check_profile.js @@ -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 check_profile_dir(profd) { Assert.ok(profd.exists()); Assert.ok(profd.isDirectory()); diff --git a/testing/xpcshell/example/unit/prefs_test_common.js b/testing/xpcshell/example/unit/prefs_test_common.js index df23b0e64abf..e12d3d529825 100644 --- a/testing/xpcshell/example/unit/prefs_test_common.js +++ b/testing/xpcshell/example/unit/prefs_test_common.js @@ -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 isValidPref(prefName) { return Services.prefs.getPrefType(prefName) !== Services.prefs.PREF_INVALID; } diff --git a/toolkit/actors/TestProcessActorChild.sys.mjs b/toolkit/actors/TestProcessActorChild.sys.mjs index dec84cb4fe8d..686f73e7f07a 100644 --- a/toolkit/actors/TestProcessActorChild.sys.mjs +++ b/toolkit/actors/TestProcessActorChild.sys.mjs @@ -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"); - export class TestProcessActorChild extends JSProcessActorChild { constructor() { super(); diff --git a/toolkit/actors/TestWindowChild.sys.mjs b/toolkit/actors/TestWindowChild.sys.mjs index 54a32fd5c534..82702f113c54 100644 --- a/toolkit/actors/TestWindowChild.sys.mjs +++ b/toolkit/actors/TestWindowChild.sys.mjs @@ -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 docShellThunks = new Map(); export class TestWindowChild extends JSWindowActorChild { diff --git a/toolkit/actors/TestWindowParent.sys.mjs b/toolkit/actors/TestWindowParent.sys.mjs index b8bbcb270b03..4886c0a95b85 100644 --- a/toolkit/actors/TestWindowParent.sys.mjs +++ b/toolkit/actors/TestWindowParent.sys.mjs @@ -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"); - export class TestWindowParent extends JSWindowActorParent { constructor() { super(); diff --git a/toolkit/components/aboutconfig/content/aboutconfig.js b/toolkit/components/aboutconfig/content/aboutconfig.js index 92820303037f..e61dc7386028 100644 --- a/toolkit/components/aboutconfig/content/aboutconfig.js +++ b/toolkit/components/aboutconfig/content/aboutconfig.js @@ -5,7 +5,6 @@ const { DeferredTask } = ChromeUtils.import( "resource://gre/modules/DeferredTask.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { Preferences } = ChromeUtils.import( "resource://gre/modules/Preferences.jsm" ); diff --git a/toolkit/components/aboutmemory/content/aboutMemory.js b/toolkit/components/aboutmemory/content/aboutMemory.js index 77f4e1504dc5..9f8805022863 100644 --- a/toolkit/components/aboutmemory/content/aboutMemory.js +++ b/toolkit/components/aboutmemory/content/aboutMemory.js @@ -29,7 +29,6 @@ const UNITS_COUNT = Ci.nsIMemoryReporter.UNITS_COUNT; const UNITS_COUNT_CUMULATIVE = Ci.nsIMemoryReporter.UNITS_COUNT_CUMULATIVE; const UNITS_PERCENTAGE = Ci.nsIMemoryReporter.UNITS_PERCENTAGE; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/toolkit/components/aboutperformance/content/aboutPerformance.js b/toolkit/components/aboutperformance/content/aboutPerformance.js index 3ad4fa522dc8..6db8ccd22cab 100644 --- a/toolkit/components/aboutperformance/content/aboutPerformance.js +++ b/toolkit/components/aboutperformance/content/aboutPerformance.js @@ -6,7 +6,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { AddonManager } = ChromeUtils.import( "resource://gre/modules/AddonManager.jsm" ); diff --git a/toolkit/components/aboutprocesses/content/aboutProcesses.js b/toolkit/components/aboutprocesses/content/aboutProcesses.js index 7ebbf2b0a0e2..8f7048372b54 100644 --- a/toolkit/components/aboutprocesses/content/aboutProcesses.js +++ b/toolkit/components/aboutprocesses/content/aboutProcesses.js @@ -27,7 +27,6 @@ const ONE_GIGA = 1024 * 1024 * 1024; const ONE_MEGA = 1024 * 1024; const ONE_KILO = 1024; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/toolkit/components/aboutthirdparty/content/aboutThirdParty.js b/toolkit/components/aboutthirdparty/content/aboutThirdParty.js index d06ace941793..f7bdc52c545e 100644 --- a/toolkit/components/aboutthirdparty/content/aboutThirdParty.js +++ b/toolkit/components/aboutthirdparty/content/aboutThirdParty.js @@ -10,7 +10,6 @@ const { AppConstants } = ChromeUtils.import( const { ProcessType } = ChromeUtils.import( "resource://gre/modules/ProcessType.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); let AboutThirdParty = null; let CrashModuleSet = null; diff --git a/toolkit/components/alerts/alert.js b/toolkit/components/alerts/alert.js index c960a44e1b88..aa2cf5ec1334 100644 --- a/toolkit/components/alerts/alert.js +++ b/toolkit/components/alerts/alert.js @@ -5,7 +5,6 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); // Copied from nsILookAndFeel.h, see comments on eMetric_AlertNotificationOrigin const NS_ALERT_HORIZONTAL = 1; diff --git a/toolkit/components/antitracking/test/xpcshell/test_rejectForeignAllowList.js b/toolkit/components/antitracking/test/xpcshell/test_rejectForeignAllowList.js index bce4229bbae4..f90f4dee109f 100644 --- a/toolkit/components/antitracking/test/xpcshell/test_rejectForeignAllowList.js +++ b/toolkit/components/antitracking/test/xpcshell/test_rejectForeignAllowList.js @@ -1,7 +1,5 @@ "use strict"; -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const { RemoteSettings } = ChromeUtils.import( "resource://services-settings/remote-settings.js" ); diff --git a/toolkit/components/apppicker/content/appPicker.js b/toolkit/components/apppicker/content/appPicker.js index d2a2e0b483d0..db4bd38e05e4 100644 --- a/toolkit/components/apppicker/content/appPicker.js +++ b/toolkit/components/apppicker/content/appPicker.js @@ -5,7 +5,6 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function AppPicker() {} diff --git a/toolkit/components/asyncshutdown/tests/xpcshell/head.js b/toolkit/components/asyncshutdown/tests/xpcshell/head.js index b84e3100960a..eb5ca3cadf86 100644 --- a/toolkit/components/asyncshutdown/tests/xpcshell/head.js +++ b/toolkit/components/asyncshutdown/tests/xpcshell/head.js @@ -2,7 +2,6 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ "use strict"; -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { AsyncShutdown } = ChromeUtils.import( "resource://gre/modules/AsyncShutdown.jsm" ); diff --git a/toolkit/components/autocomplete/tests/unit/head_autocomplete.js b/toolkit/components/autocomplete/tests/unit/head_autocomplete.js index 98c05a19c104..75fb6dc2a3ed 100644 --- a/toolkit/components/autocomplete/tests/unit/head_autocomplete.js +++ b/toolkit/components/autocomplete/tests/unit/head_autocomplete.js @@ -4,7 +4,6 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); /** * Dummy nsIAutoCompleteInput source that returns diff --git a/toolkit/components/backgroundhangmonitor/tests/child_cause_hang.js b/toolkit/components/backgroundhangmonitor/tests/child_cause_hang.js index c58cc5ecf098..adf96170b6a3 100644 --- a/toolkit/components/backgroundhangmonitor/tests/child_cause_hang.js +++ b/toolkit/components/backgroundhangmonitor/tests/child_cause_hang.js @@ -1,8 +1,6 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function ensureProfilerInitialized() { // Starting and stopping the profiler with the "stackwalk" flag will cause the // profiler's stackwalking features to be synchronously initialized. This diff --git a/toolkit/components/backgroundhangmonitor/tests/test_BHRObserver.js b/toolkit/components/backgroundhangmonitor/tests/test_BHRObserver.js index e48e0421d05e..a3c3de0c87ce 100644 --- a/toolkit/components/backgroundhangmonitor/tests/test_BHRObserver.js +++ b/toolkit/components/backgroundhangmonitor/tests/test_BHRObserver.js @@ -1,7 +1,6 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { TelemetryUtils } = ChromeUtils.import( "resource://gre/modules/TelemetryUtils.jsm" ); diff --git a/toolkit/components/backgroundtasks/tests/xpcshell/head.js b/toolkit/components/backgroundtasks/tests/xpcshell/head.js index 6a315a4f07e1..bcf930a4dccf 100644 --- a/toolkit/components/backgroundtasks/tests/xpcshell/head.js +++ b/toolkit/components/backgroundtasks/tests/xpcshell/head.js @@ -9,7 +9,6 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { BackgroundTasksTestUtils } = ChromeUtils.import( "resource://testing-common/BackgroundTasksTestUtils.jsm" diff --git a/toolkit/components/captivedetect/test/unit/head_setprefs.js b/toolkit/components/captivedetect/test/unit/head_setprefs.js index 79731c507c11..68bb7ad41e40 100644 --- a/toolkit/components/captivedetect/test/unit/head_setprefs.js +++ b/toolkit/components/captivedetect/test/unit/head_setprefs.js @@ -8,7 +8,6 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm"); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { HTTP_400, HTTP_401, diff --git a/toolkit/components/cleardata/tests/unit/head.js b/toolkit/components/cleardata/tests/unit/head.js index b2899f8e640e..0a256a9e85b1 100644 --- a/toolkit/components/cleardata/tests/unit/head.js +++ b/toolkit/components/cleardata/tests/unit/head.js @@ -1,6 +1,5 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { SiteDataTestUtils } = ChromeUtils.import( "resource://testing-common/SiteDataTestUtils.jsm" ); diff --git a/toolkit/components/contentprefs/tests/unit_cps2/head.js b/toolkit/components/contentprefs/tests/unit_cps2/head.js index 517c67cbdaad..3a07ad9901e3 100644 --- a/toolkit/components/contentprefs/tests/unit_cps2/head.js +++ b/toolkit/components/contentprefs/tests/unit_cps2/head.js @@ -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/. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - let loadContext = Cu.createLoadContext(); let privateLoadContext = Cu.createPrivateLoadContext(); diff --git a/toolkit/components/contextualidentity/tests/unit/test_corruptedFile.js b/toolkit/components/contextualidentity/tests/unit/test_corruptedFile.js index ddf312ca9fca..c4e20a33bb47 100644 --- a/toolkit/components/contextualidentity/tests/unit/test_corruptedFile.js +++ b/toolkit/components/contextualidentity/tests/unit/test_corruptedFile.js @@ -5,7 +5,6 @@ const profileDir = do_get_profile(); const { ContextualIdentityService } = ChromeUtils.import( "resource://gre/modules/ContextualIdentityService.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const TEST_STORE_FILE_PATH = PathUtils.join( profileDir.path, diff --git a/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js b/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js index 0596a67a8838..cc745d5eb816 100644 --- a/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js +++ b/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js @@ -8,7 +8,6 @@ const { Corroborate } = ChromeUtils.import( const { FileUtils } = ChromeUtils.import( "resource://gre/modules/FileUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); add_task(async function test_various_jars() { let result = await Corroborate.verifyJar(do_get_file("data/unsigned.xpi")); diff --git a/toolkit/components/crashes/tests/xpcshell/test_crash_manager.js b/toolkit/components/crashes/tests/xpcshell/test_crash_manager.js index b781c7a77c6a..e9f78091450d 100644 --- a/toolkit/components/crashes/tests/xpcshell/test_crash_manager.js +++ b/toolkit/components/crashes/tests/xpcshell/test_crash_manager.js @@ -3,7 +3,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { CrashManager } = ChromeUtils.import( "resource://gre/modules/CrashManager.jsm" ); diff --git a/toolkit/components/crashes/tests/xpcshell/test_crash_service.js b/toolkit/components/crashes/tests/xpcshell/test_crash_service.js index 6eba83a6ab5b..b534d3af8f0a 100644 --- a/toolkit/components/crashes/tests/xpcshell/test_crash_service.js +++ b/toolkit/components/crashes/tests/xpcshell/test_crash_service.js @@ -3,7 +3,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); const { getCrashManagerNoCreate } = ChromeUtils.import( diff --git a/toolkit/components/ctypes/tests/unit/head.js b/toolkit/components/ctypes/tests/unit/head.js index 4a0518de0f75..5ba018393e4f 100644 --- a/toolkit/components/ctypes/tests/unit/head.js +++ b/toolkit/components/ctypes/tests/unit/head.js @@ -1,7 +1,5 @@ /* global ChromeUtils */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - try { // We might be running without privileges, in which case it's up to the // harness to give us the 'ctypes' object. diff --git a/toolkit/components/downloads/test/unit/head.js b/toolkit/components/downloads/test/unit/head.js index 88c91756fbc8..933361561e6a 100644 --- a/toolkit/components/downloads/test/unit/head.js +++ b/toolkit/components/downloads/test/unit/head.js @@ -15,7 +15,6 @@ var { Integration } = ChromeUtils.import( 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/toolkit/components/enterprisepolicies/tests/xpcshell/head.js b/toolkit/components/enterprisepolicies/tests/xpcshell/head.js index 74bd1252f9f4..731f3bee7e12 100644 --- a/toolkit/components/enterprisepolicies/tests/xpcshell/head.js +++ b/toolkit/components/enterprisepolicies/tests/xpcshell/head.js @@ -4,7 +4,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); const { Preferences } = ChromeUtils.import( "resource://gre/modules/Preferences.jsm" diff --git a/toolkit/components/extensions/ext-browser-content.js b/toolkit/components/extensions/ext-browser-content.js index d7b7340eae74..b5e695257f08 100644 --- a/toolkit/components/extensions/ext-browser-content.js +++ b/toolkit/components/extensions/ext-browser-content.js @@ -6,7 +6,6 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { clearTimeout: "resource://gre/modules/Timer.jsm", diff --git a/toolkit/components/extensions/test/mochitest/chrome_cleanup_script.js b/toolkit/components/extensions/test/mochitest/chrome_cleanup_script.js index 397996b15cd5..1ff7e993970f 100644 --- a/toolkit/components/extensions/test/mochitest/chrome_cleanup_script.js +++ b/toolkit/components/extensions/test/mochitest/chrome_cleanup_script.js @@ -5,7 +5,6 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); let listener = msg => { void (msg instanceof Ci.nsIConsoleMessage); diff --git a/toolkit/components/extensions/test/mochitest/head.js b/toolkit/components/extensions/test/mochitest/head.js index 462e362876e1..c979e3442cbf 100644 --- a/toolkit/components/extensions/test/mochitest/head.js +++ b/toolkit/components/extensions/test/mochitest/head.js @@ -83,7 +83,6 @@ function waitForLoad(win) { /* exported loadChromeScript */ function loadChromeScript(fn) { let wrapper = ` -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); (${fn.toString()})();`; return SpecialPowers.loadChromeScript(new Function(wrapper)); diff --git a/toolkit/components/extensions/test/mochitest/mochitest_console.js b/toolkit/components/extensions/test/mochitest/mochitest_console.js index e4be8acd6983..9662426b522c 100644 --- a/toolkit/components/extensions/test/mochitest/mochitest_console.js +++ b/toolkit/components/extensions/test/mochitest/mochitest_console.js @@ -1,6 +1,5 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { addMessageListener, sendAsyncMessage } = this; // Much of the console monitoring code is copied from TestUtils but simplified diff --git a/toolkit/components/extensions/test/xpcshell/head.js b/toolkit/components/extensions/test/xpcshell/head.js index 1498e62679c3..92c47dc8837f 100644 --- a/toolkit/components/extensions/test/xpcshell/head.js +++ b/toolkit/components/extensions/test/xpcshell/head.js @@ -7,7 +7,6 @@ var { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/toolkit/components/featuregates/test/unit/head.js b/toolkit/components/featuregates/test/unit/head.js index 82e1e170c1d8..2ba2ecc7bf74 100644 --- a/toolkit/components/featuregates/test/unit/head.js +++ b/toolkit/components/featuregates/test/unit/head.js @@ -1,2 +1 @@ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm"); diff --git a/toolkit/components/forgetaboutsite/test/unit/test_removeDataFromDomain.js b/toolkit/components/forgetaboutsite/test/unit/test_removeDataFromDomain.js index 7b18fc1947a6..0911beb2a20e 100644 --- a/toolkit/components/forgetaboutsite/test/unit/test_removeDataFromDomain.js +++ b/toolkit/components/forgetaboutsite/test/unit/test_removeDataFromDomain.js @@ -19,8 +19,6 @@ const { PlacesUtils } = ChromeUtils.import( "resource://gre/modules/PlacesUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - ChromeUtils.defineModuleGetter( this, "PlacesTestUtils", diff --git a/toolkit/components/gfx/content/gfxFrameScript.js b/toolkit/components/gfx/content/gfxFrameScript.js index aa1c96ad2b74..743316f10012 100644 --- a/toolkit/components/gfx/content/gfxFrameScript.js +++ b/toolkit/components/gfx/content/gfxFrameScript.js @@ -4,8 +4,6 @@ /* eslint-env mozilla/frame-script */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const gfxFrameScript = { domUtils: null, diff --git a/toolkit/components/glean/tests/xpcshell/head.js b/toolkit/components/glean/tests/xpcshell/head.js index 1c8f220900a7..2f5b5d7af09a 100644 --- a/toolkit/components/glean/tests/xpcshell/head.js +++ b/toolkit/components/glean/tests/xpcshell/head.js @@ -4,4 +4,3 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); diff --git a/toolkit/components/kvstore/test/xpcshell/make-test-env.js b/toolkit/components/kvstore/test/xpcshell/make-test-env.js index 041677b9a6f3..5cdf64eb0d40 100644 --- a/toolkit/components/kvstore/test/xpcshell/make-test-env.js +++ b/toolkit/components/kvstore/test/xpcshell/make-test-env.js @@ -33,7 +33,6 @@ const { KeyValueService } = ChromeUtils.import( "resource://gre/modules/kvstore.jsm" ); const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); (async function() { const currentDir = await OS.File.getCurrentDirectory(); diff --git a/toolkit/components/kvstore/test/xpcshell/test_kvstore.js b/toolkit/components/kvstore/test/xpcshell/test_kvstore.js index c7defd229428..9a8b9578aba6 100644 --- a/toolkit/components/kvstore/test/xpcshell/test_kvstore.js +++ b/toolkit/components/kvstore/test/xpcshell/test_kvstore.js @@ -7,7 +7,6 @@ const { KeyValueService } = ChromeUtils.import( "resource://gre/modules/kvstore.jsm" ); const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function run_test() { do_get_profile(); diff --git a/toolkit/components/messaging-system/targeting/test/unit/head.js b/toolkit/components/messaging-system/targeting/test/unit/head.js index 085386dc49e1..ee9dd6863559 100644 --- a/toolkit/components/messaging-system/targeting/test/unit/head.js +++ b/toolkit/components/messaging-system/targeting/test/unit/head.js @@ -1,5 +1,4 @@ "use strict"; // Globals -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm"); diff --git a/toolkit/components/mozintl/test/test_mozintl.js b/toolkit/components/mozintl/test/test_mozintl.js index 9c3b5b69e832..62c320b05391 100644 --- a/toolkit/components/mozintl/test/test_mozintl.js +++ b/toolkit/components/mozintl/test/test_mozintl.js @@ -1,8 +1,6 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function run_test() { test_methods_presence(); test_methods_calling(); diff --git a/toolkit/components/mozintl/test/test_mozintl_getLocaleDisplayNames.js b/toolkit/components/mozintl/test/test_mozintl_getLocaleDisplayNames.js index e8ea601be07a..e275a46e618a 100644 --- a/toolkit/components/mozintl/test/test_mozintl_getLocaleDisplayNames.js +++ b/toolkit/components/mozintl/test/test_mozintl_getLocaleDisplayNames.js @@ -1,8 +1,6 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const fs = [ { path: "resource://mock_source/toolkit/intl/languageNames.ftl", diff --git a/toolkit/components/narrate/test/head.js b/toolkit/components/narrate/test/head.js index af29014f0816..0ed0d87ceca9 100644 --- a/toolkit/components/narrate/test/head.js +++ b/toolkit/components/narrate/test/head.js @@ -16,7 +16,6 @@ const TEST_ITALIAN_ARTICLE = var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.defineModuleGetter( this, diff --git a/toolkit/components/nimbus/test/unit/head.js b/toolkit/components/nimbus/test/unit/head.js index 69bed6f153d6..1e83334a83e8 100644 --- a/toolkit/components/nimbus/test/unit/head.js +++ b/toolkit/components/nimbus/test/unit/head.js @@ -1,7 +1,6 @@ "use strict"; // Globals -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" diff --git a/toolkit/components/normandy/metadata-script.js b/toolkit/components/normandy/metadata-script.js index 6be339985cf8..008763ad346a 100644 --- a/toolkit/components/normandy/metadata-script.js +++ b/toolkit/components/normandy/metadata-script.js @@ -5,7 +5,6 @@ /* eslint-env xpcshell */ /* globals print, quit, arguments */ const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { RecipeRunner } = ChromeUtils.import( "resource://normandy/lib/RecipeRunner.jsm" ); diff --git a/toolkit/components/normandy/test/unit/head_xpc.js b/toolkit/components/normandy/test/unit/head_xpc.js index 0890c00afe57..c7ce2ebb1fe3 100644 --- a/toolkit/components/normandy/test/unit/head_xpc.js +++ b/toolkit/components/normandy/test/unit/head_xpc.js @@ -1,4 +1,3 @@ "use strict"; -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm"); diff --git a/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js b/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js index 53c2ea23ab53..ab8ce128e5a3 100644 --- a/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js +++ b/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js @@ -8,7 +8,6 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { FileUtils } = ChromeUtils.import( "resource://gre/modules/FileUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var myok = ok; var myis = is; diff --git a/toolkit/components/osfile/tests/xpcshell/head.js b/toolkit/components/osfile/tests/xpcshell/head.js index 259fd348c28b..f50c2b8b536e 100644 --- a/toolkit/components/osfile/tests/xpcshell/head.js +++ b/toolkit/components/osfile/tests/xpcshell/head.js @@ -21,7 +21,6 @@ ChromeUtils.defineModuleGetter( "NetUtil", "resource://gre/modules/NetUtil.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); Services.prefs.setBoolPref("toolkit.osfile.log", true); diff --git a/toolkit/components/passwordmgr/crypto-SDR.js b/toolkit/components/passwordmgr/crypto-SDR.js index 059213337db5..ffd7247d44e6 100644 --- a/toolkit/components/passwordmgr/crypto-SDR.js +++ b/toolkit/components/passwordmgr/crypto-SDR.js @@ -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/toolkit/components/passwordmgr/storage-geckoview.js b/toolkit/components/passwordmgr/storage-geckoview.js index 140a1dbb1a4c..73a4155a9204 100644 --- a/toolkit/components/passwordmgr/storage-geckoview.js +++ b/toolkit/components/passwordmgr/storage-geckoview.js @@ -11,7 +11,6 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { LoginManagerStorage_json } = ChromeUtils.import( "resource://gre/modules/storage-json.js" ); diff --git a/toolkit/components/passwordmgr/storage-json.js b/toolkit/components/passwordmgr/storage-json.js index 68b6f893c0dd..5c3404b46b6f 100644 --- a/toolkit/components/passwordmgr/storage-json.js +++ b/toolkit/components/passwordmgr/storage-json.js @@ -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/toolkit/components/passwordmgr/test/mochitest/pwmgr_common_parent.js b/toolkit/components/passwordmgr/test/mochitest/pwmgr_common_parent.js index 8c8e7289181b..33957d7ad0c6 100644 --- a/toolkit/components/passwordmgr/test/mochitest/pwmgr_common_parent.js +++ b/toolkit/components/passwordmgr/test/mochitest/pwmgr_common_parent.js @@ -35,7 +35,6 @@ if (LoginHelper.improvedPasswordRulesEnabled) { await rsPromise; }; } -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); /** * Init with a common login diff --git a/toolkit/components/passwordmgr/test/unit/head.js b/toolkit/components/passwordmgr/test/unit/head.js index 0085be20bbec..5f13772b7972 100644 --- a/toolkit/components/passwordmgr/test/unit/head.js +++ b/toolkit/components/passwordmgr/test/unit/head.js @@ -12,7 +12,6 @@ const { AppConstants } = ChromeUtils.import( const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { LoginRecipesContent, LoginRecipesParent } = ChromeUtils.import( "resource://gre/modules/LoginRecipes.jsm" ); diff --git a/toolkit/components/pdfjs/pdfjs.js b/toolkit/components/pdfjs/pdfjs.js index c7063b39b1b4..772665d4f601 100644 --- a/toolkit/components/pdfjs/pdfjs.js +++ b/toolkit/components/pdfjs/pdfjs.js @@ -15,8 +15,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const lazy = {}; ChromeUtils.defineModuleGetter( diff --git a/toolkit/components/pictureinpicture/content/player.js b/toolkit/components/pictureinpicture/content/player.js index 6434d0ff77f0..6802e897b869 100644 --- a/toolkit/components/pictureinpicture/content/player.js +++ b/toolkit/components/pictureinpicture/content/player.js @@ -5,7 +5,6 @@ const { PictureInPicture } = ChromeUtils.import( "resource://gre/modules/PictureInPicture.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { DeferredTask } = ChromeUtils.import( "resource://gre/modules/DeferredTask.jsm" ); diff --git a/toolkit/components/places/tests/bookmarks/head_bookmarks.js b/toolkit/components/places/tests/bookmarks/head_bookmarks.js index 209a4ee46143..5cb91694bc29 100644 --- a/toolkit/components/places/tests/bookmarks/head_bookmarks.js +++ b/toolkit/components/places/tests/bookmarks/head_bookmarks.js @@ -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/. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // Import common head. { /* import-globals-from ../head_common.js */ diff --git a/toolkit/components/places/tests/chrome/head.js b/toolkit/components/places/tests/chrome/head.js index 1876f99255a8..57cc8ed9e2c3 100644 --- a/toolkit/components/places/tests/chrome/head.js +++ b/toolkit/components/places/tests/chrome/head.js @@ -1,7 +1,6 @@ var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { PlacesTestUtils: "resource://testing-common/PlacesTestUtils.jsm", diff --git a/toolkit/components/places/tests/expiration/head_expiration.js b/toolkit/components/places/tests/expiration/head_expiration.js index e124832b9f92..ce9fe48348a9 100644 --- a/toolkit/components/places/tests/expiration/head_expiration.js +++ b/toolkit/components/places/tests/expiration/head_expiration.js @@ -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/. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // Import common head. { /* import-globals-from ../head_common.js */ diff --git a/toolkit/components/places/tests/favicons/head_favicons.js b/toolkit/components/places/tests/favicons/head_favicons.js index 8dc16ff70788..5c520028011b 100644 --- a/toolkit/components/places/tests/favicons/head_favicons.js +++ b/toolkit/components/places/tests/favicons/head_favicons.js @@ -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/. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // Import common head. { /* import-globals-from ../head_common.js */ diff --git a/toolkit/components/places/tests/head_common.js b/toolkit/components/places/tests/head_common.js index 46baeff496c8..f389ee2489c7 100644 --- a/toolkit/components/places/tests/head_common.js +++ b/toolkit/components/places/tests/head_common.js @@ -23,7 +23,6 @@ const TITLE_LENGTH_MAX = 4096; var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); diff --git a/toolkit/components/places/tests/history/head_history.js b/toolkit/components/places/tests/history/head_history.js index 704342e543a2..4adce13ccea5 100644 --- a/toolkit/components/places/tests/history/head_history.js +++ b/toolkit/components/places/tests/history/head_history.js @@ -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/. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // Import common head. { /* import-globals-from ../head_common.js */ diff --git a/toolkit/components/places/tests/legacy/head_legacy.js b/toolkit/components/places/tests/legacy/head_legacy.js index fb3c9ce5915a..06e7fda56064 100644 --- a/toolkit/components/places/tests/legacy/head_legacy.js +++ b/toolkit/components/places/tests/legacy/head_legacy.js @@ -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/. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // Import common head. { /* import-globals-from ../head_common.js */ diff --git a/toolkit/components/places/tests/maintenance/head.js b/toolkit/components/places/tests/maintenance/head.js index e92604bb6210..49c3ad3c2f3d 100644 --- a/toolkit/components/places/tests/maintenance/head.js +++ b/toolkit/components/places/tests/maintenance/head.js @@ -1,8 +1,6 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // Import common head. { /* import-globals-from ../head_common.js */ diff --git a/toolkit/components/places/tests/migration/head_migration.js b/toolkit/components/places/tests/migration/head_migration.js index 95205dbd533f..d4440495d1ae 100644 --- a/toolkit/components/places/tests/migration/head_migration.js +++ b/toolkit/components/places/tests/migration/head_migration.js @@ -3,8 +3,6 @@ "use strict"; -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // Import common head. { /* import-globals-from ../head_common.js */ diff --git a/toolkit/components/places/tests/queries/head_queries.js b/toolkit/components/places/tests/queries/head_queries.js index 7035f36125b7..3e686e4f1626 100644 --- a/toolkit/components/places/tests/queries/head_queries.js +++ b/toolkit/components/places/tests/queries/head_queries.js @@ -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/. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // Import common head. { /* import-globals-from ../head_common.js */ diff --git a/toolkit/components/places/tests/sync/head_sync.js b/toolkit/components/places/tests/sync/head_sync.js index d5c03bb7163d..0de4c03ea64a 100644 --- a/toolkit/components/places/tests/sync/head_sync.js +++ b/toolkit/components/places/tests/sync/head_sync.js @@ -1,8 +1,6 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // Import common head. { /* import-globals-from ../head_common.js */ diff --git a/toolkit/components/places/tests/unit/head_bookmarks.js b/toolkit/components/places/tests/unit/head_bookmarks.js index e251cfe10582..f67c160c9994 100644 --- a/toolkit/components/places/tests/unit/head_bookmarks.js +++ b/toolkit/components/places/tests/unit/head_bookmarks.js @@ -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/. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // Import common head. { /* import-globals-from ../head_common.js */ diff --git a/toolkit/components/printing/content/printPageSetup.js b/toolkit/components/printing/content/printPageSetup.js index ed02a45af1cc..5f2e0ac86e9a 100644 --- a/toolkit/components/printing/content/printPageSetup.js +++ b/toolkit/components/printing/content/printPageSetup.js @@ -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"); - var gDialog; var paramBlock; var gPrintService = null; diff --git a/toolkit/components/processtools/tests/xpcshell/test_total_cpu_time.js b/toolkit/components/processtools/tests/xpcshell/test_total_cpu_time.js index c1e9d8da20be..00f1ea2b6c1c 100644 --- a/toolkit/components/processtools/tests/xpcshell/test_total_cpu_time.js +++ b/toolkit/components/processtools/tests/xpcshell/test_total_cpu_time.js @@ -1,7 +1,5 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var cpuThreadCount; add_task(async function setup() { diff --git a/toolkit/components/prompts/content/commonDialog.js b/toolkit/components/prompts/content/commonDialog.js index 97a432b32269..f11d3c3785da 100644 --- a/toolkit/components/prompts/content/commonDialog.js +++ b/toolkit/components/prompts/content/commonDialog.js @@ -9,8 +9,6 @@ const { CommonDialog } = ChromeUtils.import( // imported by adjustableTitle.js loaded in the same context: /* globals PromptUtils */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var propBag, args, Dialog; // Inherit color scheme overrides from parent window. This is to inherit the diff --git a/toolkit/components/prompts/test/chromeScript.js b/toolkit/components/prompts/test/chromeScript.js index 6006a2168d2f..d04ad8a5258a 100644 --- a/toolkit/components/prompts/test/chromeScript.js +++ b/toolkit/components/prompts/test/chromeScript.js @@ -1,6 +1,5 @@ /* eslint-env mozilla/frame-script */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { clearInterval, setInterval, setTimeout } = ChromeUtils.import( "resource://gre/modules/Timer.jsm" ); diff --git a/toolkit/components/reader/Readerable.js b/toolkit/components/reader/Readerable.js index 2d60387a7aa5..8475fa6abcda 100644 --- a/toolkit/components/reader/Readerable.js +++ b/toolkit/components/reader/Readerable.js @@ -10,7 +10,6 @@ /* exported Readerable */ /* import-globals-from Readability-readerable.js */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/toolkit/components/reputationservice/test/unit/head_download_manager.js b/toolkit/components/reputationservice/test/unit/head_download_manager.js index a1d1ad364774..c9494f2a2a7e 100644 --- a/toolkit/components/reputationservice/test/unit/head_download_manager.js +++ b/toolkit/components/reputationservice/test/unit/head_download_manager.js @@ -9,7 +9,6 @@ do_get_profile(); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { HTTP_400, HTTP_401, diff --git a/toolkit/components/satchel/test/parent_utils.js b/toolkit/components/satchel/test/parent_utils.js index b1527268322f..f5fd3561ab5c 100644 --- a/toolkit/components/satchel/test/parent_utils.js +++ b/toolkit/components/satchel/test/parent_utils.js @@ -5,7 +5,6 @@ const { FormHistory } = ChromeUtils.import( "resource://gre/modules/FormHistory.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { ContentTaskUtils } = ChromeUtils.import( "resource://testing-common/ContentTaskUtils.jsm" ); diff --git a/toolkit/components/satchel/test/unit/head_satchel.js b/toolkit/components/satchel/test/unit/head_satchel.js index 81e72129d255..4119545dd793 100644 --- a/toolkit/components/satchel/test/unit/head_satchel.js +++ b/toolkit/components/satchel/test/unit/head_satchel.js @@ -15,7 +15,6 @@ const PR_HOURS = 60 * 60 * 1000000; var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { FormHistory: "resource://gre/modules/FormHistory.jsm", FormHistoryTestUtils: "resource://testing-common/FormHistoryTestUtils.jsm", diff --git a/toolkit/components/search/tests/xpcshell/head_search.js b/toolkit/components/search/tests/xpcshell/head_search.js index debcc74326db..f536ea652c00 100644 --- a/toolkit/components/search/tests/xpcshell/head_search.js +++ b/toolkit/components/search/tests/xpcshell/head_search.js @@ -4,7 +4,6 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { clearTimeout: "resource://gre/modules/Timer.jsm", diff --git a/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js b/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js index 9f240a609090..5ec9ccafad4f 100644 --- a/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js +++ b/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js @@ -6,7 +6,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/startup/tests/unit/test_startup_crash.js b/toolkit/components/startup/tests/unit/test_startup_crash.js index fcaac6047775..7beb519a01f8 100644 --- a/toolkit/components/startup/tests/unit/test_startup_crash.js +++ b/toolkit/components/startup/tests/unit/test_startup_crash.js @@ -1,8 +1,6 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "10.0"); var prefService = Services.prefs; diff --git a/toolkit/components/taskscheduler/tests/xpcshell/test_TaskScheduler.js b/toolkit/components/taskscheduler/tests/xpcshell/test_TaskScheduler.js index c186e187b11c..a0d0a189a55c 100644 --- a/toolkit/components/taskscheduler/tests/xpcshell/test_TaskScheduler.js +++ b/toolkit/components/taskscheduler/tests/xpcshell/test_TaskScheduler.js @@ -9,8 +9,6 @@ // only touches on the basics of argument checking. On platforms without a task // scheduler implementation, these interfaces currently do nothing else. -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const { updateAppInfo } = ChromeUtils.import( "resource://testing-common/AppInfo.jsm" ); diff --git a/toolkit/components/taskscheduler/tests/xpcshell/test_TaskSchedulerMacOSImpl.js b/toolkit/components/taskscheduler/tests/xpcshell/test_TaskSchedulerMacOSImpl.js index 475793956c77..edec3184acd3 100644 --- a/toolkit/components/taskscheduler/tests/xpcshell/test_TaskSchedulerMacOSImpl.js +++ b/toolkit/components/taskscheduler/tests/xpcshell/test_TaskSchedulerMacOSImpl.js @@ -8,7 +8,6 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { TestUtils } = ChromeUtils.import( "resource://testing-common/TestUtils.jsm" ); diff --git a/toolkit/components/taskscheduler/tests/xpcshell/test_TaskSchedulerWinImpl.js b/toolkit/components/taskscheduler/tests/xpcshell/test_TaskSchedulerWinImpl.js index 414b4e84d325..cf8c5737348b 100644 --- a/toolkit/components/taskscheduler/tests/xpcshell/test_TaskSchedulerWinImpl.js +++ b/toolkit/components/taskscheduler/tests/xpcshell/test_TaskSchedulerWinImpl.js @@ -5,8 +5,6 @@ // Unit tests for Windows scheduled task generation. -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const { updateAppInfo } = ChromeUtils.import( "resource://testing-common/AppInfo.jsm" ); diff --git a/toolkit/components/taskscheduler/tests/xpcshell/test_WinTaskSchedulerService.js b/toolkit/components/taskscheduler/tests/xpcshell/test_WinTaskSchedulerService.js index 31f494fd5037..ac0ccad67035 100644 --- a/toolkit/components/taskscheduler/tests/xpcshell/test_WinTaskSchedulerService.js +++ b/toolkit/components/taskscheduler/tests/xpcshell/test_WinTaskSchedulerService.js @@ -8,7 +8,6 @@ const svc = Cc["@mozilla.org/win-task-scheduler-service;1"].getService( Ci.nsIWinTaskSchedulerService ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function randomName() { return ( diff --git a/toolkit/components/telemetry/tests/unit/head.js b/toolkit/components/telemetry/tests/unit/head.js index 1de04296d6a0..8154c8af83db 100644 --- a/toolkit/components/telemetry/tests/unit/head.js +++ b/toolkit/components/telemetry/tests/unit/head.js @@ -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/terminator/tests/xpcshell/test_terminator_record.js b/toolkit/components/terminator/tests/xpcshell/test_terminator_record.js index 3fe33abc37e7..bc76bc3ec962 100644 --- a/toolkit/components/terminator/tests/xpcshell/test_terminator_record.js +++ b/toolkit/components/terminator/tests/xpcshell/test_terminator_record.js @@ -6,7 +6,6 @@ // Test that the Shutdown Terminator records durations correctly -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm"); diff --git a/toolkit/components/terminator/tests/xpcshell/test_terminator_reload.js b/toolkit/components/terminator/tests/xpcshell/test_terminator_reload.js index 6ee9b55e6b53..7694edb86ad9 100644 --- a/toolkit/components/terminator/tests/xpcshell/test_terminator_reload.js +++ b/toolkit/components/terminator/tests/xpcshell/test_terminator_reload.js @@ -5,7 +5,6 @@ // Test that the Shutdown Terminator reloads durations correctly -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm"); diff --git a/toolkit/components/thumbnails/test/test_thumbnails_interfaces.js b/toolkit/components/thumbnails/test/test_thumbnails_interfaces.js index f7e585070237..0e0ec1f348d6 100644 --- a/toolkit/components/thumbnails/test/test_thumbnails_interfaces.js +++ b/toolkit/components/thumbnails/test/test_thumbnails_interfaces.js @@ -1,6 +1,5 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); // need profile so that PageThumbsStorageService can resolve the path to the underlying file diff --git a/toolkit/components/timermanager/tests/unit/consumerNotifications.js b/toolkit/components/timermanager/tests/unit/consumerNotifications.js index e5423227a22c..7fbbf04f1caa 100644 --- a/toolkit/components/timermanager/tests/unit/consumerNotifications.js +++ b/toolkit/components/timermanager/tests/unit/consumerNotifications.js @@ -12,7 +12,6 @@ const Cm = Components.manager; const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const CATEGORY_UPDATE_TIMER = "update-timer"; diff --git a/toolkit/components/timermanager/tests/unit/test_skipFirst.js b/toolkit/components/timermanager/tests/unit/test_skipFirst.js index a0306ec430b4..392f3dec8d98 100644 --- a/toolkit/components/timermanager/tests/unit/test_skipFirst.js +++ b/toolkit/components/timermanager/tests/unit/test_skipFirst.js @@ -3,7 +3,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/url-classifier/tests/mochitest/classifierCommon.js b/toolkit/components/url-classifier/tests/mochitest/classifierCommon.js index 593288580cb8..d5f71a3c2a2b 100644 --- a/toolkit/components/url-classifier/tests/mochitest/classifierCommon.js +++ b/toolkit/components/url-classifier/tests/mochitest/classifierCommon.js @@ -3,8 +3,6 @@ /* eslint-env mozilla/frame-script */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var dbService = Cc["@mozilla.org/url-classifier/dbservice;1"].getService( Ci.nsIUrlClassifierDBService ); diff --git a/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js b/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js index 54798affd189..773f7264581d 100644 --- a/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js +++ b/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js @@ -33,7 +33,6 @@ var { HttpError, HttpServer, } = ChromeUtils.import("resource://testing-common/httpd.js"); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); do_get_profile(); diff --git a/toolkit/components/urlformatter/tests/unit/test_urlformatter.js b/toolkit/components/urlformatter/tests/unit/test_urlformatter.js index 004b46b22c4b..c6a0c669c39f 100644 --- a/toolkit/components/urlformatter/tests/unit/test_urlformatter.js +++ b/toolkit/components/urlformatter/tests/unit/test_urlformatter.js @@ -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 run_test() { var formatter = Services.urlFormatter; var locale = Services.locale.appLocaleAsBCP47; diff --git a/toolkit/components/utils/SimpleServices.sys.mjs b/toolkit/components/utils/SimpleServices.sys.mjs index 00d5dc897601..49f8cb414dd7 100644 --- a/toolkit/components/utils/SimpleServices.sys.mjs +++ b/toolkit/components/utils/SimpleServices.sys.mjs @@ -14,7 +14,6 @@ /* globals WebExtensionPolicy */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/toolkit/components/utils/test/unit/test_ClientEnvironment.js b/toolkit/components/utils/test/unit/test_ClientEnvironment.js index 74f7994e68e6..170686da6cf5 100644 --- a/toolkit/components/utils/test/unit/test_ClientEnvironment.js +++ b/toolkit/components/utils/test/unit/test_ClientEnvironment.js @@ -2,7 +2,6 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ "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/utils/test/unit/test_FilterExpressions.js b/toolkit/components/utils/test/unit/test_FilterExpressions.js index 9089b8d76c72..a021bb5293af 100644 --- a/toolkit/components/utils/test/unit/test_FilterExpressions.js +++ b/toolkit/components/utils/test/unit/test_FilterExpressions.js @@ -1,7 +1,5 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - ChromeUtils.defineModuleGetter( this, "FilterExpressions", diff --git a/toolkit/components/viewsource/content/viewSourceUtils.js b/toolkit/components/viewsource/content/viewSourceUtils.js index ce77555c28fb..51fb06545d1a 100644 --- a/toolkit/components/viewsource/content/viewSourceUtils.js +++ b/toolkit/components/viewsource/content/viewSourceUtils.js @@ -11,8 +11,6 @@ * This file silently depends on contentAreaUtils.js for getDefaultFileName */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - ChromeUtils.defineModuleGetter( this, "PrivateBrowsingUtils", diff --git a/toolkit/components/xulstore/tests/xpcshell/test_XULStore.js b/toolkit/components/xulstore/tests/xpcshell/test_XULStore.js index 2a0cf3eb3a3f..d100592e814a 100644 --- a/toolkit/components/xulstore/tests/xpcshell/test_XULStore.js +++ b/toolkit/components/xulstore/tests/xpcshell/test_XULStore.js @@ -4,8 +4,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var XULStore = null; var browserURI = "chrome://browser/content/browser.xhtml"; var aboutURI = "about:config"; diff --git a/toolkit/components/xulstore/tests/xpcshell/test_XULStore_migration_profile_change.js b/toolkit/components/xulstore/tests/xpcshell/test_XULStore_migration_profile_change.js index d60bf8004bfb..2571f3215eb1 100644 --- a/toolkit/components/xulstore/tests/xpcshell/test_XULStore_migration_profile_change.js +++ b/toolkit/components/xulstore/tests/xpcshell/test_XULStore_migration_profile_change.js @@ -7,7 +7,6 @@ const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); const { FileUtils } = ChromeUtils.import( "resource://gre/modules/FileUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); add_task( { diff --git a/toolkit/content/about.js b/toolkit/content/about.js index 93436e659a70..469f77b8d534 100644 --- a/toolkit/content/about.js +++ b/toolkit/content/about.js @@ -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"); - // get release notes and vendor URL from prefs var releaseNotesURL = Services.urlFormatter.formatURLPref( "app.releaseNotesURL" diff --git a/toolkit/content/aboutGlean.js b/toolkit/content/aboutGlean.js index 0d1715905b0c..d5063de50fe2 100644 --- a/toolkit/content/aboutGlean.js +++ b/toolkit/content/aboutGlean.js @@ -4,8 +4,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function onLoad() { document.getElementById("controls-submit").addEventListener("click", () => { let tag = document.getElementById("tag-pings").value; diff --git a/toolkit/content/aboutNetworking.js b/toolkit/content/aboutNetworking.js index 79bbf7b94cb1..8cb51e630629 100644 --- a/toolkit/content/aboutNetworking.js +++ b/toolkit/content/aboutNetworking.js @@ -4,7 +4,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const FileUtils = ChromeUtils.import("resource://gre/modules/FileUtils.jsm") .FileUtils; const gEnv = Cc["@mozilla.org/process/environment;1"].getService( diff --git a/toolkit/content/aboutProfiles.js b/toolkit/content/aboutProfiles.js index 3af94f985766..dc1ae771921f 100644 --- a/toolkit/content/aboutProfiles.js +++ b/toolkit/content/aboutProfiles.js @@ -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/content/aboutServiceWorkers.js b/toolkit/content/aboutServiceWorkers.js index f3f1ecefdb3d..2093947f4ab7 100644 --- a/toolkit/content/aboutServiceWorkers.js +++ b/toolkit/content/aboutServiceWorkers.js @@ -4,8 +4,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var gSWM; var gSWCount = 0; diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js index 961431813d9d..d13c82dfac83 100644 --- a/toolkit/content/aboutSupport.js +++ b/toolkit/content/aboutSupport.js @@ -4,7 +4,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { Troubleshoot } = ChromeUtils.import( "resource://gre/modules/Troubleshoot.jsm" ); diff --git a/toolkit/content/aboutTelemetry.js b/toolkit/content/aboutTelemetry.js index 25c5631811c3..869a8bbd5e01 100644 --- a/toolkit/content/aboutTelemetry.js +++ b/toolkit/content/aboutTelemetry.js @@ -7,7 +7,6 @@ const { BrowserUtils } = ChromeUtils.import( "resource://gre/modules/BrowserUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { TelemetryTimestamps } = ChromeUtils.import( "resource://gre/modules/TelemetryTimestamps.jsm" ); diff --git a/toolkit/content/aboutUrlClassifier.js b/toolkit/content/aboutUrlClassifier.js index 3d86535a660b..219f6d829fa9 100644 --- a/toolkit/content/aboutUrlClassifier.js +++ b/toolkit/content/aboutUrlClassifier.js @@ -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 UPDATE_BEGIN = "safebrowsing-update-begin"; const UPDATE_FINISH = "safebrowsing-update-finished"; const JSLOG_PREF = "browser.safebrowsing.debug"; diff --git a/toolkit/content/aboutwebrtc/aboutWebrtc.js b/toolkit/content/aboutwebrtc/aboutWebrtc.js index c83759e1ec60..30848a590403 100644 --- a/toolkit/content/aboutwebrtc/aboutWebrtc.js +++ b/toolkit/content/aboutwebrtc/aboutWebrtc.js @@ -6,7 +6,6 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.defineModuleGetter( this, diff --git a/toolkit/content/contentAreaUtils.js b/toolkit/content/contentAreaUtils.js index 68905b0a8e8d..ac5c3e35316c 100644 --- a/toolkit/content/contentAreaUtils.js +++ b/toolkit/content/contentAreaUtils.js @@ -5,7 +5,6 @@ var { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/toolkit/content/plugins.js b/toolkit/content/plugins.js index 64a877796d2b..043d4b33e08a 100644 --- a/toolkit/content/plugins.js +++ b/toolkit/content/plugins.js @@ -6,8 +6,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - /* JavaScript to enumerate and display all installed plug-ins * First, refresh plugins in case anything has been changed recently in diff --git a/toolkit/content/process-content.js b/toolkit/content/process-content.js index 65cf64df1f9b..e5f673dd48bb 100644 --- a/toolkit/content/process-content.js +++ b/toolkit/content/process-content.js @@ -6,7 +6,6 @@ // Creates a new PageListener for this process. This will listen for page loads // and for those that match URLs provided by the parent process will set up // a dedicated message port and notify the parent process. -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); Services.cpmm.addMessageListener("gmp-plugin-crash", ({ data }) => { Cc["@mozilla.org/gecko-media-plugin-service;1"] diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js index e0947bb96e70..caef7a12894c 100644 --- a/toolkit/content/resetProfile.js +++ b/toolkit/content/resetProfile.js @@ -4,8 +4,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - document.addEventListener("dialogaccept", onResetProfileAccepted); document .getElementById("refreshProfileLearnMore") diff --git a/toolkit/content/tests/unit/test_contentAreaUtils.js b/toolkit/content/tests/unit/test_contentAreaUtils.js index b06432fa5aa3..6ea83db25159 100644 --- a/toolkit/content/tests/unit/test_contentAreaUtils.js +++ b/toolkit/content/tests/unit/test_contentAreaUtils.js @@ -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/. */ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function loadUtilsScript() { /* import-globals-from ../../contentAreaUtils.js */ Services.scriptloader.loadSubScript( diff --git a/toolkit/content/viewZoomOverlay.js b/toolkit/content/viewZoomOverlay.js index 93b1bddb1716..36142d3d51b1 100644 --- a/toolkit/content/viewZoomOverlay.js +++ b/toolkit/content/viewZoomOverlay.js @@ -10,8 +10,6 @@ * or use the methods that accept a browser to be modified. **/ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var ZoomManager = { set useFullZoom(aVal) { Services.prefs.setBoolPref("browser.zoom.full", aVal); diff --git a/toolkit/crashreporter/content/crashes.js b/toolkit/crashreporter/content/crashes.js index 226bfd69067c..89469f7dbe6d 100644 --- a/toolkit/crashreporter/content/crashes.js +++ b/toolkit/crashreporter/content/crashes.js @@ -7,7 +7,6 @@ let reportURL; const { CrashReports } = ChromeUtils.import( "resource://gre/modules/CrashReports.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); ChromeUtils.defineModuleGetter( diff --git a/toolkit/crashreporter/test/browser/head.js b/toolkit/crashreporter/test/browser/head.js index d9ba22a1387d..fea602a02896 100644 --- a/toolkit/crashreporter/test/browser/head.js +++ b/toolkit/crashreporter/test/browser/head.js @@ -1,5 +1,3 @@ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function create_subdir(dir, subdirname) { let subdir = dir.clone(); subdir.append(subdirname); diff --git a/toolkit/crashreporter/test/unit/crasher_subprocess_head.js b/toolkit/crashreporter/test/unit/crasher_subprocess_head.js index fdeefb5c3dda..ff48a582bd48 100644 --- a/toolkit/crashreporter/test/unit/crasher_subprocess_head.js +++ b/toolkit/crashreporter/test/unit/crasher_subprocess_head.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // enable crash reporting first var cwd = Services.dirsvc.get("CurWorkD", Ci.nsIFile); diff --git a/toolkit/crashreporter/test/unit/head_crashreporter.js b/toolkit/crashreporter/test/unit/head_crashreporter.js index 3fb9c18fd217..2bc3255b58bc 100644 --- a/toolkit/crashreporter/test/unit/head_crashreporter.js +++ b/toolkit/crashreporter/test/unit/head_crashreporter.js @@ -1,5 +1,4 @@ var { OS, require } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { makeFakeAppDir } = ChromeUtils.import( "resource://testing-common/AppData.jsm" ); diff --git a/toolkit/modules/subprocess/test/xpcshell/head.js b/toolkit/modules/subprocess/test/xpcshell/head.js index f418b3f6d21c..8881c54d7217 100644 --- a/toolkit/modules/subprocess/test/xpcshell/head.js +++ b/toolkit/modules/subprocess/test/xpcshell/head.js @@ -3,7 +3,6 @@ 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/toolkit/modules/tests/xpcshell/head.js b/toolkit/modules/tests/xpcshell/head.js index 6479a5c45b8a..ffea7e0c79b5 100644 --- a/toolkit/modules/tests/xpcshell/head.js +++ b/toolkit/modules/tests/xpcshell/head.js @@ -1,7 +1,6 @@ var { NewTabUtils } = ChromeUtils.import( "resource://gre/modules/NewTabUtils.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/toolkit/modules/tests/xpcshell/test_osKeyStore.js b/toolkit/modules/tests/xpcshell/test_osKeyStore.js index 82d567f5d7eb..865e86bac793 100644 --- a/toolkit/modules/tests/xpcshell/test_osKeyStore.js +++ b/toolkit/modules/tests/xpcshell/test_osKeyStore.js @@ -4,7 +4,6 @@ "use strict"; -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { TestUtils } = ChromeUtils.import( "resource://testing-common/TestUtils.jsm" ); diff --git a/toolkit/mozapps/downloads/tests/unit/head_downloads.js b/toolkit/mozapps/downloads/tests/unit/head_downloads.js index 11b5d32697db..59f2ee3ab8f4 100644 --- a/toolkit/mozapps/downloads/tests/unit/head_downloads.js +++ b/toolkit/mozapps/downloads/tests/unit/head_downloads.js @@ -1,5 +1,3 @@ -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - registerCleanupFunction(function() { Services.startup.advanceShutdownPhase( Services.startup.SHUTDOWN_PHASE_APPSHUTDOWNCONFIRMED diff --git a/toolkit/mozapps/extensions/addonManager.js b/toolkit/mozapps/extensions/addonManager.js index 331bb63a49da..3650d9aab8b8 100644 --- a/toolkit/mozapps/extensions/addonManager.js +++ b/toolkit/mozapps/extensions/addonManager.js @@ -46,8 +46,6 @@ const MSG_INSTALL_CLEANUP = "WebAPICleanup"; const MSG_ADDON_EVENT_REQ = "WebAPIAddonEventRequest"; const MSG_ADDON_EVENT = "WebAPIAddonEvent"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var AddonManager, AddonManagerPrivate; function amManager() { ({ AddonManager, AddonManagerPrivate } = ChromeUtils.import( diff --git a/toolkit/mozapps/extensions/content/aboutaddonsCommon.js b/toolkit/mozapps/extensions/content/aboutaddonsCommon.js index 07f70ff23f55..aeb82649e68d 100644 --- a/toolkit/mozapps/extensions/content/aboutaddonsCommon.js +++ b/toolkit/mozapps/extensions/content/aboutaddonsCommon.js @@ -15,7 +15,6 @@ const { AddonSettings } = ChromeUtils.import( "resource://gre/modules/addons/AddonSettings.jsm" ); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/toolkit/mozapps/extensions/content/abuse-report-panel.js b/toolkit/mozapps/extensions/content/abuse-report-panel.js index 15da9db6240d..5de7192ec6c9 100644 --- a/toolkit/mozapps/extensions/content/abuse-report-panel.js +++ b/toolkit/mozapps/extensions/content/abuse-report-panel.js @@ -5,8 +5,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - ChromeUtils.defineModuleGetter( this, "AbuseReporter", diff --git a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js index 88aa66c1c412..60292d9d9c92 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js +++ b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js @@ -38,7 +38,6 @@ var { AppConstants } = ChromeUtils.import( ); var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm"); var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/toolkit/mozapps/extensions/test/xpinstall/slowinstall.sjs b/toolkit/mozapps/extensions/test/xpinstall/slowinstall.sjs index b9150b0697e3..358e4ceca534 100644 --- a/toolkit/mozapps/extensions/test/xpinstall/slowinstall.sjs +++ b/toolkit/mozapps/extensions/test/xpinstall/slowinstall.sjs @@ -1,4 +1,3 @@ -let { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); let { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); let { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); diff --git a/toolkit/mozapps/handling/content/appChooser.js b/toolkit/mozapps/handling/content/appChooser.js index 3c532d928599..94b3a46bb1ba 100644 --- a/toolkit/mozapps/handling/content/appChooser.js +++ b/toolkit/mozapps/handling/content/appChooser.js @@ -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 { PrivateBrowsingUtils } = ChromeUtils.import( "resource://gre/modules/PrivateBrowsingUtils.jsm" ); diff --git a/toolkit/mozapps/handling/content/permissionDialog.js b/toolkit/mozapps/handling/content/permissionDialog.js index 57424411d33a..83164ff7bf9c 100644 --- a/toolkit/mozapps/handling/content/permissionDialog.js +++ b/toolkit/mozapps/handling/content/permissionDialog.js @@ -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 { EnableDelayHelper } = ChromeUtils.import( "resource://gre/modules/SharedPromptUtils.jsm" ); diff --git a/toolkit/mozapps/preferences/changemp.js b/toolkit/mozapps/preferences/changemp.js index 765009ee6e36..22de9701408b 100644 --- a/toolkit/mozapps/preferences/changemp.js +++ b/toolkit/mozapps/preferences/changemp.js @@ -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 nsPK11TokenDB = "@mozilla.org/security/pk11tokendb;1"; const nsIPK11TokenDB = Ci.nsIPK11TokenDB; const nsIDialogParamBlock = Ci.nsIDialogParamBlock; diff --git a/toolkit/mozapps/preferences/removemp.js b/toolkit/mozapps/preferences/removemp.js index dcbf0834b814..797f8a41bdd6 100644 --- a/toolkit/mozapps/preferences/removemp.js +++ b/toolkit/mozapps/preferences/removemp.js @@ -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"); - var gRemovePasswordDialog = { _token: null, _okButton: null, diff --git a/toolkit/mozapps/update/tests/data/app_update.sjs b/toolkit/mozapps/update/tests/data/app_update.sjs index b702300eb064..610778fe8bda 100644 --- a/toolkit/mozapps/update/tests/data/app_update.sjs +++ b/toolkit/mozapps/update/tests/data/app_update.sjs @@ -11,8 +11,6 @@ // Definitions from test and other files used by the tests /* global getState */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function getTestDataFile(aFilename) { let file = Services.dirsvc.get("CurWorkD", Ci.nsIFile); let pathParts = REL_PATH_DATA.split("/"); diff --git a/toolkit/mozapps/update/tests/data/syncManagerTestChild.js b/toolkit/mozapps/update/tests/data/syncManagerTestChild.js index 4500b75f217f..7e017a66707f 100644 --- a/toolkit/mozapps/update/tests/data/syncManagerTestChild.js +++ b/toolkit/mozapps/update/tests/data/syncManagerTestChild.js @@ -15,8 +15,6 @@ print("child process is running"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // This function is copied from xpcshellUtilsAUS.js so that we can have our // xpcshell subprocess call it without having to load that whole file, because // it turns out that needs a bunch of infrastructure that normally the testing diff --git a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js index 427e23cfe7b4..102432a7096a 100644 --- a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js +++ b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js @@ -30,7 +30,6 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { TestUtils } = ChromeUtils.import( "resource://testing-common/TestUtils.jsm" ); diff --git a/toolkit/profile/content/createProfileWizard.js b/toolkit/profile/content/createProfileWizard.js index d9396fccbc17..e41bd71dbfc7 100644 --- a/toolkit/profile/content/createProfileWizard.js +++ b/toolkit/profile/content/createProfileWizard.js @@ -8,7 +8,6 @@ const I = Ci; const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const ToolkitProfileService = "@mozilla.org/toolkit/profile-service;1"; diff --git a/toolkit/profile/content/profileSelection.js b/toolkit/profile/content/profileSelection.js index 66c58be4d73e..028b6871a556 100644 --- a/toolkit/profile/content/profileSelection.js +++ b/toolkit/profile/content/profileSelection.js @@ -7,7 +7,6 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const C = Cc; const I = Ci; diff --git a/toolkit/profile/xpcshell/head.js b/toolkit/profile/xpcshell/head.js index 6f3bc893ea49..b6193c5b9fa0 100644 --- a/toolkit/profile/xpcshell/head.js +++ b/toolkit/profile/xpcshell/head.js @@ -1,7 +1,6 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -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/xre/test/test_install_hash.js b/toolkit/xre/test/test_install_hash.js index 3b97640e4cf0..9fdcb9891cef 100644 --- a/toolkit/xre/test/test_install_hash.js +++ b/toolkit/xre/test/test_install_hash.js @@ -6,7 +6,6 @@ * They should all result in the same installation hash. */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { Subprocess } = ChromeUtils.import( "resource://gre/modules/Subprocess.jsm" ); diff --git a/toolkit/xre/test/test_launch_without_hang.js b/toolkit/xre/test/test_launch_without_hang.js index a0bb81b28c73..2d8b7525e8b5 100644 --- a/toolkit/xre/test/test_launch_without_hang.js +++ b/toolkit/xre/test/test_launch_without_hang.js @@ -7,7 +7,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); diff --git a/tools/profiler/tests/shared-head.js b/tools/profiler/tests/shared-head.js index 8eb8dfa293a1..b32062ff93d7 100644 --- a/tools/profiler/tests/shared-head.js +++ b/tools/profiler/tests/shared-head.js @@ -16,7 +16,6 @@ const INTERVAL_END = 3; // This Services declaration may shadow another from head.js, so define it as // a var rather than a const. -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const defaultSettings = { entries: 8 * 1024 * 1024, // 8M entries = 64MB diff --git a/tools/profiler/tests/xpcshell/head.js b/tools/profiler/tests/xpcshell/head.js index 7dad522e26c9..483820a45bec 100644 --- a/tools/profiler/tests/xpcshell/head.js +++ b/tools/profiler/tests/xpcshell/head.js @@ -6,7 +6,6 @@ // This Services declaration may shadow another from head.js, so define it as // a var rather than a const. -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" diff --git a/uriloader/exthandler/tests/unit/head.js b/uriloader/exthandler/tests/unit/head.js index 1bd2278774e9..a9b18fdf76c7 100644 --- a/uriloader/exthandler/tests/unit/head.js +++ b/uriloader/exthandler/tests/unit/head.js @@ -13,7 +13,6 @@ var { AppConstants } = ChromeUtils.import( ); var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm"); var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); diff --git a/widget/headless/tests/test_headless.js b/widget/headless/tests/test_headless.js index a887cdf092a5..83c952f44f3b 100644 --- a/widget/headless/tests/test_headless.js +++ b/widget/headless/tests/test_headless.js @@ -1,7 +1,6 @@ /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */ /* vim: set sts=2 sw=2 et tw=80: */ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); do_get_profile(); diff --git a/widget/headless/tests/test_headless_clipboard.js b/widget/headless/tests/test_headless_clipboard.js index 6c0ffcd5a1c1..24fb6fc50fc2 100644 --- a/widget/headless/tests/test_headless_clipboard.js +++ b/widget/headless/tests/test_headless_clipboard.js @@ -1,7 +1,6 @@ /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */ /* vim: set sts=2 sw=2 et tw=80: */ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function getString(clipboard) { var str = ""; diff --git a/widget/tests/unit/test_taskbar_jumplistitems.js b/widget/tests/unit/test_taskbar_jumplistitems.js index 4d114330fd00..1ba6006ec801 100644 --- a/widget/tests/unit/test_taskbar_jumplistitems.js +++ b/widget/tests/unit/test_taskbar_jumplistitems.js @@ -4,7 +4,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // This tests taskbar jump list functionality available on win7 and up. -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function test_basics() { var item = Cc["@mozilla.org/windows-jumplistitem;1"].createInstance( diff --git a/xpcom/tests/unit/test_bug121341.js b/xpcom/tests/unit/test_bug121341.js index b345b1a77853..2796fc47f206 100644 --- a/xpcom/tests/unit/test_bug121341.js +++ b/xpcom/tests/unit/test_bug121341.js @@ -1,5 +1,4 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); function run_test() { var dataFile = do_get_file("data/bug121341.properties"); diff --git a/xpcom/tests/unit/test_bug1434856.js b/xpcom/tests/unit/test_bug1434856.js index 1034f4e265e4..a8dfa080792b 100644 --- a/xpcom/tests/unit/test_bug1434856.js +++ b/xpcom/tests/unit/test_bug1434856.js @@ -1,8 +1,6 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/licenses/publicdomain/ */ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function run_test() { let complete = false; diff --git a/xpcom/tests/unit/test_bug332389.js b/xpcom/tests/unit/test_bug332389.js index cf7d9bdb972c..605772f12a2f 100644 --- a/xpcom/tests/unit/test_bug332389.js +++ b/xpcom/tests/unit/test_bug332389.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function run_test() { var f = Services.dirsvc.get("CurProcD", Ci.nsIFile); diff --git a/xpcom/tests/unit/test_bug364285-1.js b/xpcom/tests/unit/test_bug364285-1.js index 7d36cf734ecc..167e94e8520c 100644 --- a/xpcom/tests/unit/test_bug364285-1.js +++ b/xpcom/tests/unit/test_bug364285-1.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var nameArray = [ "ascii", // ASCII "fran\u00E7ais", // Latin-1 diff --git a/xpcom/tests/unit/test_bug374754.js b/xpcom/tests/unit/test_bug374754.js index 497678fc62d0..0d20d90b2c76 100644 --- a/xpcom/tests/unit/test_bug374754.js +++ b/xpcom/tests/unit/test_bug374754.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var addedTopic = "xpcom-category-entry-added"; var removedTopic = "xpcom-category-entry-removed"; var testCategory = "bug-test-category"; diff --git a/xpcom/tests/unit/test_file_createUnique.js b/xpcom/tests/unit/test_file_createUnique.js index 8667f16495ca..510002bda2ae 100644 --- a/xpcom/tests/unit/test_file_createUnique.js +++ b/xpcom/tests/unit/test_file_createUnique.js @@ -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"); - function run_test() { // Generate a leaf name that is 255 characters long. var longLeafName = new Array(256).join("T"); diff --git a/xpcom/tests/unit/test_file_equality.js b/xpcom/tests/unit/test_file_equality.js index 0e141fe52cda..74ea8046d86d 100644 --- a/xpcom/tests/unit/test_file_equality.js +++ b/xpcom/tests/unit/test_file_equality.js @@ -6,8 +6,6 @@ var LocalFile = CC("@mozilla.org/file/local;1", "nsIFile", "initWithPath"); -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function run_test() { test_normalized_vs_non_normalized(); } diff --git a/xpcom/tests/unit/test_file_renameTo.js b/xpcom/tests/unit/test_file_renameTo.js index e02bd02d700c..a6e863377353 100644 --- a/xpcom/tests/unit/test_file_renameTo.js +++ b/xpcom/tests/unit/test_file_renameTo.js @@ -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"); - function run_test() { // Create the base directory. let base = Services.dirsvc.get("TmpD", Ci.nsIFile); diff --git a/xpcom/tests/unit/test_hidden_files.js b/xpcom/tests/unit/test_hidden_files.js index 3f232072da5b..27d87e6f542f 100644 --- a/xpcom/tests/unit/test_hidden_files.js +++ b/xpcom/tests/unit/test_hidden_files.js @@ -1,7 +1,5 @@ const NS_OS_TEMP_DIR = "TmpD"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - var hiddenUnixFile; function createUNIXHiddenFile() { var tmpDir = Services.dirsvc.get(NS_OS_TEMP_DIR, Ci.nsIFile); diff --git a/xpcom/tests/unit/test_home.js b/xpcom/tests/unit/test_home.js index 40fe89abfb3f..ef53fa7fcfbb 100644 --- a/xpcom/tests/unit/test_home.js +++ b/xpcom/tests/unit/test_home.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const CWD = do_get_cwd(); function checkOS(os) { const nsILocalFile_ = "nsILocalFile" + os; diff --git a/xpcom/tests/unit/test_mac_xattrs.js b/xpcom/tests/unit/test_mac_xattrs.js index a27f42d27dd1..0f725b88939a 100644 --- a/xpcom/tests/unit/test_mac_xattrs.js +++ b/xpcom/tests/unit/test_mac_xattrs.js @@ -4,7 +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 { FileUtils } = ChromeUtils.import( "resource://gre/modules/FileUtils.jsm" ); diff --git a/xpcom/tests/unit/test_process_directives.js b/xpcom/tests/unit/test_process_directives.js index ca15883ebd55..b1975a43dac0 100644 --- a/xpcom/tests/unit/test_process_directives.js +++ b/xpcom/tests/unit/test_process_directives.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - function categoryExists(category, entry) { try { Services.catMan.getCategoryEntry(category, entry); diff --git a/xpcom/tests/unit/test_systemInfo.js b/xpcom/tests/unit/test_systemInfo.js index c25cf4b41aa4..5f4ad2dc5886 100644 --- a/xpcom/tests/unit/test_systemInfo.js +++ b/xpcom/tests/unit/test_systemInfo.js @@ -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 run_test() { const PROPERTIES = [ "name", diff --git a/xpcom/tests/unit/test_versioncomparator.js b/xpcom/tests/unit/test_versioncomparator.js index cd25823fe458..5744d62721a1 100644 --- a/xpcom/tests/unit/test_versioncomparator.js +++ b/xpcom/tests/unit/test_versioncomparator.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - // Versions to test listed in ascending order, none can be equal var comparisons = [ "pre", diff --git a/xpcom/tests/unit/test_windows_cmdline_file.js b/xpcom/tests/unit/test_windows_cmdline_file.js index a51d11a35713..318f93ebecb5 100644 --- a/xpcom/tests/unit/test_windows_cmdline_file.js +++ b/xpcom/tests/unit/test_windows_cmdline_file.js @@ -1,5 +1,3 @@ -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - let executableFile = Services.dirsvc.get("CurProcD", Ci.nsIFile); executableFile.append("xpcshell.exe"); function run_test() {