Bug 1789201 - [devtools] Expose Services as a global to all DevTools modules. r=perftest-reviewers,nchevobbe,julienw,AlexandruIonescu

This will help transition to ES Modules as this symbol is exposed to them.

$ sed -ie "/require(.Services.)/d" $(git grep -l 'require("Services")' devtools/)
$ sed -ie "/loader.lazyRequireGetter(this, .Services./d" $(git grep -l 'loader.lazyRequireGetter(this, "Services"' devtools/)
+ the edition of builtin-modules.js + eslintrc.js
+ manual eslint fixes
+ removal of devtools-services in the debugger, except for jest tests

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

devtools/client/aboutdebugging/aboutdebugging.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
-
 const { bindActionCreators } = require("devtools/client/shared/vendor/redux");
 const { createFactory } = require("devtools/client/shared/vendor/react");
 const {

devtools/client/aboutdebugging/src/actions/debug-targets.js

@@ -8,7 +8,6 @@ const { AddonManager } = require("resource://gre/modules/AddonManager.jsm");
 const {
   remoteClientManager,
 } = require("devtools/client/shared/remote-debugging/remote-client-manager");
-const Services = require("Services");
 
 const { l10n } = require("devtools/client/aboutdebugging/src/modules/l10n");
 

devtools/client/aboutdebugging/src/actions/runtimes.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
-
 const Actions = require("devtools/client/aboutdebugging/src/actions/index");
 
 const {

devtools/client/aboutdebugging/src/create-store.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
-
 const {
   applyMiddleware,
   createStore,

devtools/client/aboutdebugging/src/middleware/process-component-data.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const { l10n } = require("devtools/client/aboutdebugging/src/modules/l10n");
 
 const {

devtools/client/aboutdebugging/src/modules/debug-target-collapsibilities.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
-
 const PREF_PREFIX = "devtools.aboutdebugging.collapsibilities.";
 const {
   DEBUG_TARGET_PANE,

devtools/client/aboutdebugging/src/modules/debug-target-support.js

@@ -10,8 +10,6 @@ const {
   RUNTIMES,
 } = require("devtools/client/aboutdebugging/src/constants");
 
-const Services = require("Services");
-
 // Process target debugging is disabled by default.
 function isProcessDebuggingSupported() {
   return Services.prefs.getBoolPref(

devtools/client/aboutdebugging/src/modules/extensions-helper.js

@@ -5,7 +5,6 @@
 "use strict";
 
 const { Cc, Ci } = require("chrome");
-const Services = require("Services");
 loader.lazyImporter(
   this,
   "AddonManager",

devtools/client/aboutdebugging/src/modules/network-locations.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
-
 const NETWORK_LOCATIONS_PREF = "devtools.aboutdebugging.network-locations";
 
 /**

devtools/client/accessibility/actions/ui.js

@@ -3,8 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const Services = require("Services");
-
 const {
   ENABLE,
   RESET,

devtools/client/accessibility/panel.js

@@ -3,8 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const Services = require("Services");
-
 const EventEmitter = require("devtools/shared/event-emitter");
 
 const Telemetry = require("devtools/client/shared/telemetry");

devtools/client/accessibility/reducers/ui.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
-
 const {
   AUDIT,
   ENABLE,

devtools/client/accessibility/test/chrome/test_accessible_learnMoreLink.html

@@ -23,7 +23,6 @@ Test that LearnMoreLink parses and renders correctly text with learn more links.
 window.onload = async function() {
   try {
     const { gDevTools } = require("devtools/client/framework/devtools");
-    const Services = browserRequire("Services");
     const ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     const { createFactory } = browserRequire("devtools/client/shared/vendor/react");
     const { Simulate } =

devtools/client/accessibility/test/chrome/test_accessible_openLink.html

@@ -23,7 +23,6 @@ Test that openLink function is called if accessible object property is rendered
 window.onload = async function() {
   try {
     const { gDevTools } = require("devtools/client/framework/devtools");
-    const Services = browserRequire("Services");
     const ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     const { createFactory, createElement } =
       browserRequire("devtools/client/shared/vendor/react");

devtools/client/accessibility/test/chrome/test_accessible_row_context_menu.html

@@ -23,7 +23,6 @@ Test that openLink function is called if accessible object property is rendered
 window.onload = async function() {
   try {
     const { gDevTools } = require("devtools/client/framework/devtools");
-    const Services = browserRequire("Services");
     const ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     const { createFactory, createElement } =
       browserRequire("devtools/client/shared/vendor/react");

devtools/client/application/src/modules/application-services.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
-
 // keyword to use in telemetry, as `reason` parameter
 const REASON = "application";
 

devtools/client/debugger/configs/mozilla-central-mappings.js

@@ -13,7 +13,6 @@ module.exports = {
   "prop-types": "devtools/client/shared/vendor/react-prop-types",
   "devtools-modules/src/menu": "devtools/client/framework/menu",
   "devtools-modules/src/menu/menu-item": "devtools/client/framework/menu-item",
-  "devtools-services": "Services",
   "wasmparser/dist/cjs/WasmParser": "devtools/client/shared/vendor/WasmParser",
   "wasmparser/dist/cjs/WasmDis": "devtools/client/shared/vendor/WasmDis",
 };

devtools/client/debugger/src/components/App.js

@@ -24,7 +24,6 @@ const KeyShortcuts = require("devtools/client/shared/key-shortcuts");
 const SplitBox = require("devtools/client/shared/components/splitter/SplitBox");
 const AppErrorBoundary = require("devtools/client/shared/components/AppErrorBoundary");
 
-import Services from "devtools-services";
 const shortcuts = new KeyShortcuts({ window });
 
 const { appinfo } = Services;

devtools/client/debugger/src/components/Editor/index.js

@@ -83,7 +83,6 @@ import {
 } from "../../utils/editor";
 
 import { resizeToggleButton, resizeBreakpointGutter } from "../../utils/ui";
-import Services from "devtools-services";
 
 const { debounce } = require("devtools/shared/debounce");
 

devtools/client/debugger/src/components/SecondaryPanes/CommandBar.js

@@ -22,13 +22,11 @@ import { debugBtn } from "../shared/Button/CommandBarButton";
 import AccessibleImage from "../shared/AccessibleImage";
 import "./CommandBar.css";
 
-import { appinfo } from "devtools-services";
-
 const MenuButton = require("devtools/client/shared/components/menu/MenuButton");
 const MenuItem = require("devtools/client/shared/components/menu/MenuItem");
 const MenuList = require("devtools/client/shared/components/menu/MenuList");
 
-const isMacOS = appinfo.OS === "Darwin";
+const isMacOS = Services.appinfo.OS === "Darwin";
 
 // NOTE: the "resume" command will call either the resume or breakOnNext action
 // depending on whether or not the debugger is paused or running
@@ -57,7 +55,7 @@ const KEYS = {
 };
 
 function getKey(action) {
-  return getKeyForOS(appinfo.OS, action);
+  return getKeyForOS(Services.appinfo.OS, action);
 }
 
 function getKeyForOS(os, action) {

devtools/client/debugger/src/utils/prefs.js

@@ -5,7 +5,6 @@
 const { PrefsHelper } = require("devtools/client/shared/prefs");
 
 import { isNode } from "./environment";
-import Services from "devtools-services";
 
 // Schema version to bump when the async store format has changed incompatibly
 // and old stores should be cleared.

devtools/client/debugger/src/utils/text.js

@@ -6,10 +6,8 @@
  * Utils for keyboard command strings
  * @module utils/text
  */
-import Services from "devtools-services";
-const { appinfo } = Services;
 
-const isMacOS = appinfo.OS === "Darwin";
+const isMacOS = Services.appinfo.OS === "Darwin";
 
 /**
  * Formats key for use in tooltips

devtools/client/definitions.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const osString = Services.appinfo.OS;
 
 // Panels

devtools/client/devtools-experimental-prefs.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
-
 loader.lazyRequireGetter(
   this,
   "HTMLTooltip",

devtools/client/framework/browser-toolbox/Launcher.sys.mjs

@@ -46,8 +46,6 @@ XPCOMUtils.defineLazyServiceGetters(lazy, {
 const Telemetry = require("devtools/client/shared/telemetry");
 const EventEmitter = require("devtools/shared/event-emitter");
 
-const Services = require("Services");
-
 const env = Cc["@mozilla.org/process/environment;1"].getService(
   Ci.nsIEnvironment
 );

devtools/client/framework/browser-toolbox/window.js

@@ -13,7 +13,6 @@ loader.require("devtools/client/framework/devtools-browser");
 
 var { gDevTools } = require("devtools/client/framework/devtools");
 var { Toolbox } = require("devtools/client/framework/toolbox");
-var Services = require("Services");
 var { DevToolsClient } = require("devtools/client/devtools-client");
 var { PrefsHelper } = require("devtools/client/shared/prefs");
 const KeyShortcuts = require("devtools/client/shared/key-shortcuts");

devtools/client/framework/components/ChromeDebugToolbar.js

@@ -3,8 +3,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const Services = require("Services");
-
 const {
   PureComponent,
   createFactory,

devtools/client/framework/components/DebugTargetInfo.js

@@ -3,7 +3,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const Services = require("Services");
 const { PureComponent } = require("devtools/client/shared/vendor/react");
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");

devtools/client/framework/devtools-browser.js

@@ -12,7 +12,6 @@
  * browser window is ready (i.e. fired browser-delayed-startup-finished event)
  **/
 
-const Services = require("Services");
 const ChromeUtils = require("ChromeUtils");
 
 const lazy = {};

devtools/client/framework/devtools.js

@@ -5,7 +5,6 @@
 "use strict";
 
 const { Cu } = require("chrome");
-const Services = require("Services");
 const ChromeUtils = require("ChromeUtils");
 
 const {

devtools/client/framework/source-map-url-service.js

@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const Services = require("Services");
 const SOURCE_MAP_PREF = "devtools.source-map.client-service.enabled";
 
 /**

devtools/client/framework/toolbox-host-manager.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const { LocalizationHelper } = require("devtools/shared/l10n");
 const L10N = new LocalizationHelper(
   "devtools/client/locales/toolbox.properties"

devtools/client/framework/toolbox-hosts.js

@@ -5,7 +5,6 @@
 "use strict";
 
 const EventEmitter = require("devtools/shared/event-emitter");
-const Services = require("Services");
 
 loader.lazyRequireGetter(
   this,

devtools/client/framework/toolbox-options.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const { gDevTools } = require("devtools/client/framework/devtools");
 
 const { LocalizationHelper } = require("devtools/shared/l10n");

devtools/client/framework/toolbox-tabs-order-manager.js

@@ -6,7 +6,6 @@
 
 const { AddonManager } = require("resource://gre/modules/AddonManager.jsm");
 const { gDevTools } = require("devtools/client/framework/devtools");
-const Services = require("Services");
 const Telemetry = require("devtools/client/shared/telemetry");
 const TABS_REORDERED_SCALAR = "devtools.toolbox.tabs_reordered";
 const PREFERENCE_NAME = "devtools.toolbox.tabsOrder";

devtools/client/framework/toolbox.js

@@ -27,7 +27,6 @@ var { Ci, Cc } = require("chrome");
 const { debounce } = require("devtools/shared/debounce");
 const { throttle } = require("devtools/shared/throttle");
 const { safeAsyncMethod } = require("devtools/shared/async-utils");
-var Services = require("Services");
 var ChromeUtils = require("ChromeUtils");
 var { gDevTools } = require("devtools/client/framework/devtools");
 var EventEmitter = require("devtools/shared/event-emitter");

devtools/client/fronts/accessibility.js

@@ -16,7 +16,6 @@ const {
   simulatorSpec,
 } = require("devtools/shared/specs/accessibility");
 const events = require("devtools/shared/event-emitter");
-const Services = require("Services");
 const BROWSER_TOOLBOX_FISSION_ENABLED = Services.prefs.getBoolPref(
   "devtools.browsertoolbox.fission",
   false

devtools/client/fronts/descriptors/process.js

@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const Services = require("Services");
 const {
   processDescriptorSpec,
 } = require("devtools/shared/specs/descriptors/process");

devtools/client/fronts/descriptors/tab.js

@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const Services = require("Services");
 const { tabDescriptorSpec } = require("devtools/shared/specs/descriptors/tab");
 const DESCRIPTOR_TYPES = require("devtools/client/fronts/descriptors/descriptor-types");
 

devtools/client/fronts/inspector.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const Telemetry = require("devtools/client/shared/telemetry");
 const {
   FrontClassWithSpec,

devtools/client/fronts/node.js

@@ -11,7 +11,6 @@ const {
 } = require("devtools/shared/protocol.js");
 const { nodeSpec, nodeListSpec } = require("devtools/shared/specs/node");
 const { SimpleStringFront } = require("devtools/client/fronts/string");
-const Services = require("Services");
 
 loader.lazyRequireGetter(
   this,

devtools/client/fronts/walker.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const {
   FrontClassWithSpec,
   types,

devtools/client/inspector/boxmodel/components/BoxModelEditable.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const { PureComponent } = require("devtools/client/shared/vendor/react");
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");

devtools/client/inspector/compatibility/components/IssueItem.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const {
   createFactory,
   PureComponent,

devtools/client/inspector/grids/components/GridOutline.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const { PureComponent } = require("devtools/client/shared/vendor/react");
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");

devtools/client/inspector/grids/grid-inspector.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const flags = require("devtools/shared/flags");
 const { throttle } = require("devtools/shared/throttle");
 

devtools/client/inspector/grids/reducers/grids.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
-
 const {
   UPDATE_GRID_COLOR,
   UPDATE_GRID_HIGHLIGHTED,

devtools/client/inspector/grids/reducers/highlighter-settings.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
-
 const {
   UPDATE_SHOW_GRID_AREAS,
   UPDATE_SHOW_GRID_LINE_NUMBERS,

devtools/client/inspector/inspector-search.js

@@ -8,7 +8,6 @@ const { KeyCodes } = require("devtools/client/shared/keycodes");
 
 const EventEmitter = require("devtools/shared/event-emitter");
 const AutocompletePopup = require("devtools/client/shared/autocomplete-popup");
-const Services = require("Services");
 
 // Maximum number of selector suggestions shown in the panel.
 const MAX_SUGGESTIONS = 15;

devtools/client/inspector/inspector.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const EventEmitter = require("devtools/shared/event-emitter");
 const flags = require("devtools/shared/flags");
 const { executeSoon } = require("devtools/shared/DevToolsUtils");

devtools/client/inspector/layout/components/LayoutApp.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const {
   createFactory,
   createRef,

devtools/client/inspector/markup/markup-context-menu.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const { PSEUDO_CLASSES } = require("devtools/shared/css/constants");
 const { LocalizationHelper } = require("devtools/shared/l10n");
 

devtools/client/inspector/markup/markup.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const flags = require("devtools/shared/flags");
 const nodeConstants = require("devtools/shared/dom-node-constants");
 const nodeFilterConstants = require("devtools/shared/dom-node-filter-constants");

devtools/client/inspector/markup/views/element-container.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const MarkupContainer = require("devtools/client/inspector/markup/views/markup-container");
 const ElementEditor = require("devtools/client/inspector/markup/views/element-editor");
 const { ELEMENT_NODE } = require("devtools/shared/dom-node-constants");

devtools/client/inspector/markup/views/element-editor.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const TextEditor = require("devtools/client/inspector/markup/views/text-editor");
 const { truncateString } = require("devtools/shared/inspector/utils");
 const {

devtools/client/inspector/markup/views/html-editor.js

@@ -5,7 +5,6 @@
 "use strict";
 
 const Editor = require("devtools/client/shared/sourceeditor/editor");
-const Services = require("Services");
 const EventEmitter = require("devtools/shared/event-emitter");
 
 /**

devtools/client/inspector/rules/models/element-style.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const Rule = require("devtools/client/inspector/rules/models/rule");
 const UserProperties = require("devtools/client/inspector/rules/models/user-properties");
 const {

devtools/client/inspector/rules/models/rule.js

@@ -9,7 +9,6 @@ const {
 } = require("devtools/shared/constants");
 const CssLogic = require("devtools/shared/inspector/css-logic");
 const TextProperty = require("devtools/client/inspector/rules/models/text-property");
-const Services = require("Services");
 
 loader.lazyRequireGetter(
   this,

devtools/client/inspector/rules/rules.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const flags = require("devtools/shared/flags");
 const { l10n } = require("devtools/shared/inspector/css-logic");
 const {

devtools/client/inspector/rules/views/rule-editor.js

@@ -28,7 +28,6 @@ const {
   SELECTOR_ELEMENT,
   SELECTOR_PSEUDO_CLASS,
 } = require("devtools/shared/css/parsing-utils");
-const Services = require("Services");
 const EventEmitter = require("devtools/shared/event-emitter");
 const CssLogic = require("devtools/shared/inspector/css-logic");
 

devtools/client/inspector/rules/views/text-property-editor.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const { l10n } = require("devtools/shared/inspector/css-logic");
 const {
   InplaceEditor,

devtools/client/inspector/shared/compatibility-user-settings.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
-
 const ChromeUtils = require("ChromeUtils");
 const { RemoteSettings } = ChromeUtils.import(
   "resource://services-settings/remote-settings.js"

devtools/client/inspector/shared/highlighters-overlay.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const { safeAsyncMethod } = require("devtools/shared/async-utils");
 const EventEmitter = require("devtools/shared/event-emitter");
 const WalkerEventListener = require("devtools/client/inspector/shared/walker-event-listener");

devtools/client/inspector/shared/style-inspector-menu.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const {
   VIEW_NODE_SELECTOR_TYPE,
   VIEW_NODE_PROPERTY_TYPE,

devtools/client/inspector/shared/tooltips-overlay.js

@@ -9,7 +9,6 @@
  * editor tooltips that appear when clicking swatch based editors.
  */
 
-const Services = require("Services");
 const flags = require("devtools/shared/flags");
 const {
   VIEW_NODE_VALUE_TYPE,

devtools/client/jsonview/converter-child.js

@@ -6,7 +6,6 @@
 
 const { components, Ci, Cr, Cu, CC } = require("chrome");
 const ChromeUtils = require("ChromeUtils");
-const Services = require("Services");
 
 loader.lazyRequireGetter(
   this,

devtools/client/memory/app.js

@@ -5,7 +5,6 @@
 "use strict";
 
 const { assert } = require("devtools/shared/DevToolsUtils");
-const { appinfo } = require("Services");
 const {
   Component,
   createFactory,
@@ -146,7 +145,7 @@ class MemoryApp extends Component {
     const selectedSnapshot = snapshots.find(s => s.selected);
     const selectedIndex = snapshots.indexOf(selectedSnapshot);
 
-    const isOSX = appinfo.OS == "Darwin";
+    const isOSX = Services.appinfo.OS == "Darwin";
     const isAccelKey = (isOSX && e.metaKey) || (!isOSX && e.ctrlKey);
 
     // On ACCEL+UP, select previous snapshot.

devtools/client/memory/test/chrome/head.js

@@ -11,7 +11,6 @@ var { require } = BrowserLoader({
   window,
 });
 var { Assert } = require("resource://testing-common/Assert.jsm");
-var Services = require("Services");
 
 var EXPECTED_DTU_ASSERT_FAILURE_COUNT = 0;
 

devtools/client/menus.js

@@ -34,7 +34,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
     "resource://devtools/client/framework/browser-toolbox/Launcher.sys.mjs",
 });
 
-loader.lazyRequireGetter(this, "Services", "Services");
 loader.lazyRequireGetter(this, "flags", "devtools/shared/flags");
 
 loader.lazyRequireGetter(

devtools/client/netmonitor/src/actions/request-blocking.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
-
 const {
   ADD_BLOCKED_URL,
   TOGGLE_BLOCKING_ENABLED,

devtools/client/netmonitor/src/actions/ui.js

@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
-const Services = require("Services");
 const {
   ACTIVITY_TYPE,
   OPEN_NETWORK_DETAILS,

devtools/client/netmonitor/src/components/MonitorPanel.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const {
   Component,
   createFactory,

devtools/client/netmonitor/src/components/NetworkActionBar.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const {
   Component,
   createFactory,

devtools/client/netmonitor/src/components/Toolbar.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const {
   Component,
   createFactory,

devtools/client/netmonitor/src/components/messages/MessageListContent.js

@@ -9,7 +9,6 @@ const {
   createFactory,
 } = require("devtools/client/shared/vendor/react");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
-const Services = require("Services");
 const {
   connect,
 } = require("devtools/client/shared/redux/visibility-handler-connect");

devtools/client/netmonitor/src/components/messages/MessagePayload.js

@@ -16,7 +16,6 @@ const {
   connect,
 } = require("devtools/client/shared/redux/visibility-handler-connect");
 
-const Services = require("Services");
 const { L10N } = require("devtools/client/netmonitor/src/utils/l10n.js");
 const {
   getMessagePayload,

devtools/client/netmonitor/src/components/messages/MessagesView.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const {
   Component,
   createRef,

devtools/client/netmonitor/src/components/request-details/HeadersPanel.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const {
   Component,
   createFactory,

devtools/client/netmonitor/src/components/request-details/NetworkDetailsBar.js

@@ -5,7 +5,6 @@
 "use strict";
 
 const { createFactory } = require("devtools/client/shared/vendor/react");
-const Services = require("Services");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const {

devtools/client/netmonitor/src/components/request-details/RequestPanel.js

@@ -10,7 +10,6 @@ const {
 } = require("devtools/client/shared/vendor/react");
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
-const Services = require("Services");
 const {
   connect,
 } = require("devtools/client/shared/redux/visibility-handler-connect");

devtools/client/netmonitor/src/components/request-details/ResponsePanel.js

@@ -9,7 +9,6 @@ const {
 } = require("devtools/client/shared/vendor/react");
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
-const Services = require("Services");
 const { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
 const {
   decodeUnicodeBase64,

devtools/client/netmonitor/src/connector/index.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const {
   ACTIVITY_TYPE,
   EVENTS,

devtools/client/netmonitor/src/create-store.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const {
   applyMiddleware,
   createStore,

devtools/client/netmonitor/src/har/har-automation.js

@@ -5,7 +5,6 @@
 "use strict";
 
 const { Ci } = require("chrome");
-const Services = require("Services");
 const {
   HarCollector,
 } = require("devtools/client/netmonitor/src/har/har-collector");

devtools/client/netmonitor/src/har/har-builder.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const appInfo = Services.appinfo;
 const { LocalizationHelper } = require("devtools/shared/l10n");
 const { CurlUtils } = require("devtools/client/shared/curl");

devtools/client/netmonitor/src/har/har-collector.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const {
   getLongStringFullText,
 } = require("devtools/client/shared/string-utils");

devtools/client/netmonitor/src/har/har-exporter.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 const JSZip = require("devtools/client/shared/vendor/jszip");
 const clipboardHelper = require("devtools/shared/platform/clipboard");

devtools/client/netmonitor/src/har/har-utils.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const { Ci, Cc, CC } = require("chrome");
 const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.sys.mjs");
 

devtools/client/netmonitor/src/middleware/prefs.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const {
   ENABLE_REQUEST_FILTER_TYPE_ONLY,
   RESET_COLUMNS,

devtools/client/netmonitor/src/reducers/ui.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const {
   CLEAR_REQUESTS,
   OPEN_NETWORK_DETAILS,

devtools/client/netmonitor/src/utils/firefox/open-request-in-tab.js

@@ -14,7 +14,6 @@
 "use strict";
 
 const { Cc, Ci } = require("chrome");
-const Services = require("Services");
 const { gDevTools } = require("devtools/client/framework/devtools");
 
 /**

devtools/client/netmonitor/src/widgets/RequestListContextMenu.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
 const {
   formDataURI,

devtools/client/performance-new/aboutprofiling/initializer.js

@@ -68,7 +68,6 @@ const createStore = require("devtools/client/shared/redux/create-store");
 const reducers = require("devtools/client/performance-new/store/reducers");
 const actions = require("devtools/client/performance-new/store/actions");
 const { Ci } = require("chrome");
-const Services = require("Services");
 
 /**
  * Initialize the panel by creating a redux store, and render the root component.

devtools/client/performance-new/browser.js

@@ -28,7 +28,6 @@ const { createLazyLoaders } = ChromeUtils.import(
 
 const lazy = createLazyLoaders({
   Chrome: () => require("chrome"),
-  Services: () => require("Services"),
 });
 
 /** @type {PerformancePref["UIBaseUrl"]} */
@@ -60,8 +59,6 @@ const UI_BASE_URL_PATH_DEFAULT = "/from-browser";
  * @returns {Promise<MockedExports.Browser>} The browser for the opened tab.
  */
 async function openProfilerTab(profilerViewMode) {
-  const Services = lazy.Services();
-
   // Allow the user to point to something other than profiler.firefox.com.
   const baseUrl = Services.prefs.getStringPref(
     UI_BASE_URL_PREF,
@@ -149,7 +146,6 @@ function sharedLibrariesFromProfile(profile) {
  * @type {RestartBrowserWithEnvironmentVariable}
  */
 function restartBrowserWithEnvironmentVariable(envName, value) {
-  const Services = lazy.Services();
   const { Cc, Ci } = lazy.Chrome();
   const env = Cc["@mozilla.org/process/environment;1"].getService(
     Ci.nsIEnvironment

devtools/client/performance-new/components/OnboardingMessage.js

@@ -32,7 +32,6 @@ const Localized = createFactory(
   require("devtools/client/shared/vendor/fluent-react").Localized
 );
 
-const Services = require("Services");
 const { openDocLink } = require("devtools/client/shared/link");
 
 const LEARN_MORE_URL = "https://profiler.firefox.com/docs";

devtools/client/responsive/actions/devices.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const asyncStorage = require("devtools/shared/async-storage");
 
 const {

devtools/client/responsive/components/App.js

@@ -6,7 +6,6 @@
 
 "use strict";
 
-const Services = require("Services");
 const {
   createFactory,
   PureComponent,

devtools/client/responsive/reducers/ui.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
-
 const {
   CHANGE_DISPLAY_PIXEL_RATIO,
   CHANGE_USER_AGENT,

devtools/client/responsive/reducers/viewports.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const Services = require("Services");
-
 const {
   ADD_VIEWPORT,
   CHANGE_DEVICE,

devtools/client/responsive/test/xpcshell/head.js

@@ -9,7 +9,6 @@ const { require } = ChromeUtils.import(
   "resource://devtools/shared/loader/Loader.jsm"
 );
 
-const Services = require("Services");
 const Store = require("devtools/client/responsive/store");
 
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");