Bug 1667455 - Part 5: Stop importing Services.jsm from chrome-priv JS code, top-level single-line cases. r=kmag,webdriver-reviewers,perftest-reviewers,webcompat-reviewers,geckoview-reviewers,extension-reviewers,application-update-reviewers,pip-reviewers,twisniewski,m_kato,jdescottes,mconley,AlexandruIonescu,mossop

Differential Revision: https://phabricator.services.mozilla.com/D150894

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,

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.

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.
  */

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"
 );

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"
 );

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

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"
 );

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(

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" },

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");
 
 /**

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"
 );

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"
 );

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";

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");

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();

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();

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,

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"

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",

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,

browser/components/downloads/test/unit/head.js

@@ -1,5 +1,3 @@
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 ChromeUtils.defineModuleGetter(
   this,
   "Downloads",

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"
 );

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"
 );

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;

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"
 );

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,

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"
 );

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
 );

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"
 );

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"
 );

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"
 );

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",

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"
 );

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"
 );

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",

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"
 );

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",

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"
 );

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.
  *

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"

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

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(

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",

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";

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;
 

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);

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"
 );

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"
 );

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,

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"
 );

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" },

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";
 

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"
 );

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(

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);
 

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();
 

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 =

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"
 );

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";

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();
 

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",

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",

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",

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",

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"
 );

browser/components/sessionstore/test/unit/head.js

@@ -1,5 +1,3 @@
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 ChromeUtils.defineModuleGetter(
   this,
   "SessionStartup",

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"

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"

browser/components/syncedtabs/TabListView.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 const lazy = {};
 
 ChromeUtils.defineModuleGetter(

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");

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() {

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);

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"
 );

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,

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"
 );

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"
 );

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"
 );

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",

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"
 );

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"
 );

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,

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",

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",

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"
 );

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);

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"
 );

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"
 );

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.

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"
 );

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"
 );

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"

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;
 

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"
 );

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);

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);

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"
 );

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

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) {

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) {

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"
 );