Bug 1667455 - Part 4: Stop importing Services.jsm from JSM. r=kmag,webdriver-reviewers,perftest-reviewers,webcompat-reviewers,geckoview-reviewers,application-update-reviewers,pip-reviewers,twisniewski,devtools-reviewers,m_kato,jdescottes,ochameau,mconley,sfoster,AlexandruIonescu

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

Author: arai-a

accessible/tests/browser/Common.jsm

@@ -6,7 +6,6 @@
 
 const EXPORTED_SYMBOLS = ["CommonUtils"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { Assert } = ChromeUtils.import("resource://testing-common/Assert.jsm");
 
 const MAX_TRIM_LENGTH = 100;

browser/actors/AboutNewTabChild.jsm

@@ -6,7 +6,6 @@
 
 var EXPORTED_SYMBOLS = ["AboutNewTabChild"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/actors/AboutPrivateBrowsingChild.jsm

@@ -13,8 +13,6 @@ const { RemotePageChild } = ChromeUtils.import(
   "resource://gre/actors/RemotePageChild.jsm"
 );
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 const lazy = {};
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {

browser/actors/AboutPrivateBrowsingParent.jsm

@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["AboutPrivateBrowsingParent"];
 const { ASRouter } = ChromeUtils.import(
   "resource://activity-stream/lib/ASRouter.jsm"
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { BrowserUtils } = ChromeUtils.import(
   "resource://gre/modules/BrowserUtils.jsm"
 );

browser/actors/AboutProtectionsChild.jsm

@@ -5,7 +5,6 @@
 
 var EXPORTED_SYMBOLS = ["AboutProtectionsChild"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { RemotePageChild } = ChromeUtils.import(
   "resource://gre/actors/RemotePageChild.jsm"
 );

browser/actors/AboutProtectionsParent.jsm

@@ -8,7 +8,6 @@ var EXPORTED_SYMBOLS = ["AboutProtectionsParent"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const lazy = {};
 

browser/actors/AboutReaderParent.jsm

@@ -7,8 +7,6 @@
 
 var EXPORTED_SYMBOLS = ["AboutReaderParent"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 const lazy = {};
 
 ChromeUtils.defineModuleGetter(

browser/actors/BlockedSiteChild.jsm

@@ -3,8 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 var EXPORTED_SYMBOLS = ["BlockedSiteChild"];
 
 const lazy = {};

browser/actors/BlockedSiteParent.jsm

@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 var EXPORTED_SYMBOLS = ["BlockedSiteParent"];
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 class BlockedSiteParent extends JSWindowActorParent {
   receiveMessage(msg) {

browser/actors/BrowserTabChild.jsm

@@ -6,8 +6,6 @@
 
 var EXPORTED_SYMBOLS = ["BrowserTabChild"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 const lazy = {};
 
 ChromeUtils.defineModuleGetter(

browser/actors/ClickHandlerChild.jsm

@@ -5,7 +5,6 @@
 
 var EXPORTED_SYMBOLS = ["ClickHandlerChild", "MiddleMousePasteHandlerChild"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/actors/ContentSearchParent.jsm

@@ -5,7 +5,6 @@
 
 var EXPORTED_SYMBOLS = ["ContentSearchParent", "ContentSearch"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/actors/ContextMenuChild.jsm

@@ -8,7 +8,6 @@
 
 var EXPORTED_SYMBOLS = ["ContextMenuChild"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/actors/DOMFullscreenChild.jsm

@@ -6,8 +6,6 @@
 
 var EXPORTED_SYMBOLS = ["DOMFullscreenChild"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 class DOMFullscreenChild extends JSWindowActorChild {
   receiveMessage(aMessage) {
     let window = this.contentWindow;

browser/actors/DOMFullscreenParent.jsm

@@ -6,8 +6,6 @@
 
 var EXPORTED_SYMBOLS = ["DOMFullscreenParent"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 class DOMFullscreenParent extends JSWindowActorParent {
   // These properties get set by browser-fullScreenAndPointerLock.js.
   // TODO: Bug 1743703 - Consider moving the messaging component of

browser/actors/DecoderDoctorParent.jsm

@@ -11,7 +11,6 @@ var EXPORTED_SYMBOLS = ["DecoderDoctorParent"];
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/actors/EncryptedMediaChild.jsm

@@ -6,8 +6,6 @@
 
 var EXPORTED_SYMBOLS = ["EncryptedMediaChild"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 /**
  * GlobalCaptureListener is a class that listens for changes to the global
  * capture state of windows and screens. It uses this information to notify

browser/actors/EncryptedMediaParent.jsm

@@ -7,7 +7,6 @@
 
 var EXPORTED_SYMBOLS = ["EncryptedMediaParent"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/actors/FormValidationChild.jsm

@@ -13,7 +13,6 @@ var EXPORTED_SYMBOLS = ["FormValidationChild"];
 const { LayoutUtils } = ChromeUtils.import(
   "resource://gre/modules/LayoutUtils.jsm"
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 class FormValidationChild extends JSWindowActorChild {
   constructor() {

browser/actors/FormValidationParent.jsm

@@ -18,8 +18,6 @@ ChromeUtils.defineModuleGetter(
   "resource:///modules/BrowserWindowTracker.jsm"
 );
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 class PopupShownObserver {
   _weakContext = null;
 

browser/actors/LightweightThemeChild.jsm

@@ -6,8 +6,6 @@
 
 var EXPORTED_SYMBOLS = ["LightweightThemeChild"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 /**
  * LightweightThemeChild forwards theme data to in-content pages.
  * It is both instantiated by the traditional Actor mechanism,

browser/actors/LinkHandlerChild.jsm

@@ -6,8 +6,6 @@
 
 const EXPORTED_SYMBOLS = ["LinkHandlerChild"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 const lazy = {};
 
 ChromeUtils.defineModuleGetter(

browser/actors/LinkHandlerParent.jsm

@@ -6,8 +6,6 @@
 
 const EXPORTED_SYMBOLS = ["LinkHandlerParent"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 const lazy = {};
 
 ChromeUtils.defineModuleGetter(

browser/actors/NetErrorChild.jsm

@@ -5,7 +5,6 @@
 
 var EXPORTED_SYMBOLS = ["NetErrorChild"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/actors/NetErrorParent.jsm

@@ -5,7 +5,6 @@
 
 var EXPORTED_SYMBOLS = ["NetErrorParent"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/actors/PageInfoChild.jsm

@@ -4,7 +4,6 @@
 
 var EXPORTED_SYMBOLS = ["PageInfoChild"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/actors/PluginParent.jsm

@@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = ["PluginParent", "PluginManager"];
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/actors/PromptParent.jsm

@@ -14,7 +14,6 @@ ChromeUtils.defineModuleGetter(
   "PromptUtils",
   "resource://gre/modules/SharedPromptUtils.jsm"
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/actors/RefreshBlockerChild.jsm

@@ -10,7 +10,6 @@
 
 var EXPORTED_SYMBOLS = ["RefreshBlockerChild", "RefreshBlockerObserverChild"];
 
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
 
 const REFRESHBLOCKING_PREF = "accessibility.blockautorefresh";

browser/actors/SearchSERPTelemetryChild.jsm

@@ -8,7 +8,6 @@ var EXPORTED_SYMBOLS = ["SearchSERPTelemetryChild", "ADLINK_CHECK_TIMEOUT_MS"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const lazy = {};
 

browser/actors/WebRTCChild.jsm

@@ -6,7 +6,6 @@
 
 var EXPORTED_SYMBOLS = ["WebRTCChild"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/actors/WebRTCParent.jsm

@@ -6,7 +6,6 @@
 
 var EXPORTED_SYMBOLS = ["WebRTCParent"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/base/content/test/performance/StartupContentSubframe.jsm

@@ -4,7 +4,6 @@
 /**
  * test helper JSWindowActors used by the browser_startup_content_subframe.js test.
  */
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var EXPORTED_SYMBOLS = [
   "StartupContentSubframeParent",

browser/components/BrowserContentHandler.jsm

@@ -10,7 +10,6 @@ var EXPORTED_SYMBOLS = [
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );

browser/components/BrowserGlue.jsm

@@ -12,7 +12,6 @@ var EXPORTED_SYMBOLS = [
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );

browser/components/StartupRecorder.jsm

@@ -7,7 +7,6 @@ var EXPORTED_SYMBOLS = ["StartupRecorder"];
 const Cm = Components.manager;
 Cm.QueryInterface(Ci.nsIServiceManager);
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );

browser/components/aboutlogins/AboutLoginsChild.jsm

@@ -12,7 +12,6 @@ const { LoginHelper } = ChromeUtils.import(
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const lazy = {};
 

browser/components/aboutlogins/AboutLoginsParent.jsm

@@ -13,7 +13,6 @@ const { setTimeout, clearTimeout } = ChromeUtils.import(
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );

browser/components/aboutlogins/LoginBreaches.jsm

@@ -11,7 +11,6 @@
 
 const EXPORTED_SYMBOLS = ["LoginBreaches"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/components/attribution/AttributionCode.jsm

@@ -20,7 +20,6 @@ const { XPCOMUtils } = ChromeUtils.import(
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const lazy = {};
 ChromeUtils.defineModuleGetter(
   lazy,

browser/components/attribution/MacAttribution.jsm

@@ -21,7 +21,6 @@ XPCOMUtils.defineLazyGetter(lazy, "log", () => {
   };
   return new ConsoleAPI(consoleOptions);
 });
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 ChromeUtils.defineModuleGetter(
   lazy,

browser/components/customizableui/CustomizableUI.jsm

@@ -5,7 +5,6 @@
 
 var EXPORTED_SYMBOLS = ["CustomizableUI"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/components/customizableui/CustomizableWidgets.jsm

@@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["CustomizableWidgets"];
 const { CustomizableUI } = ChromeUtils.import(
   "resource:///modules/CustomizableUI.jsm"
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/components/customizableui/CustomizeMode.jsm

@@ -22,7 +22,6 @@ const kDownloadAutohideCheckboxId = "downloads-button-autohide-checkbox";
 const kDownloadAutohidePanelId = "downloads-button-autohide-panel";
 const kDownloadAutoHidePref = "browser.download.autohideButton";
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { CustomizableUI } = ChromeUtils.import(
   "resource:///modules/CustomizableUI.jsm"
 );

browser/components/customizableui/PanelMultiView.jsm

@@ -104,7 +104,6 @@ var EXPORTED_SYMBOLS = ["PanelMultiView", "PanelView"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const lazy = {};
 ChromeUtils.defineModuleGetter(
   lazy,

browser/components/customizableui/SearchWidgetTracker.jsm

@@ -11,7 +11,6 @@
 
 var EXPORTED_SYMBOLS = ["SearchWidgetTracker"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );

browser/components/doh/DoHConfig.jsm

@@ -15,7 +15,6 @@ var EXPORTED_SYMBOLS = ["DoHConfigController"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { RemoteSettings } = ChromeUtils.import(
   "resource://services-settings/remote-settings.js"
 );

browser/components/doh/DoHController.jsm

@@ -11,7 +11,6 @@
  */
 var EXPORTED_SYMBOLS = ["DoHController"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );