Bug 1789980 - [devtools] Migrate all callsites using require("chrome") to use Components.* global symbols. r=jdescottes,perftest-reviewers,AlexandruIonescu

This will help transition to ES Modules as we won't be able to expose a magic "chrome" ESM.
Also, most of these symbols are exposed as global already.
All but:
* `components` which is `Components`,
* `CC` which is `Components.Constructor`,
* `Cm` which is `Components.manager`.

$ sed -ie "/require(.chrome.)/d" $(git grep -l 'require("chrome")' devtools/)
+ manual edits for all three exceptions

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

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

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Ci } = require("chrome");
-
 const {
   DEBUG_TARGETS,
   REQUEST_WORKERS_SUCCESS,

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

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

devtools/client/application/src/components/service-workers/Registration.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Ci } = require("chrome");
-
 const {
   createFactory,
   PureComponent,

devtools/client/application/src/components/service-workers/Worker.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Ci } = require("chrome");
-
 const {
   createFactory,
   PureComponent,

devtools/client/application/test/xpcshell/test_workers_reducer.js

@@ -3,8 +3,6 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
-const { Ci } = require("chrome");
-
 const {
   updateCanDebugWorkers,
   updateWorkers,

devtools/client/dom/panel.js

@@ -3,8 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { Cu } = require("chrome");
-
 const EventEmitter = require("devtools/shared/event-emitter");
 loader.lazyRequireGetter(
   this,

devtools/client/framework/browser-menus.js

@@ -12,7 +12,6 @@
  * - devtools/client/definitions for tool-specifics entries
  */
 
-const { Cu } = require("chrome");
 const { LocalizationHelper } = require("devtools/shared/l10n");
 const MENUS_L10N = new LocalizationHelper(
   "devtools/client/locales/menus.properties"

devtools/client/framework/devtools.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Cu } = require("chrome");
-
 const {
   DevToolsShim,
 } = require("chrome://devtools-startup/content/DevToolsShim.jsm");

devtools/client/framework/toolbox.js

@@ -24,7 +24,6 @@ const BROWSERTOOLBOX_SCOPE_PREF = "devtools.browsertoolbox.scope";
 const BROWSERTOOLBOX_SCOPE_EVERYTHING = "everything";
 const BROWSERTOOLBOX_SCOPE_PARENTPROCESS = "parent-process";
 
-var { Ci, Cc } = require("chrome");
 const { debounce } = require("devtools/shared/debounce");
 const { throttle } = require("devtools/shared/throttle");
 const { safeAsyncMethod } = require("devtools/shared/async-utils");

devtools/client/fronts/descriptors/worker.js

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

devtools/client/fronts/root.js

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

devtools/client/fronts/worker/service-worker.js

@@ -10,7 +10,6 @@ const {
   FrontClassWithSpec,
   registerFront,
 } = require("devtools/shared/protocol");
-const { Ci } = require("chrome");
 const { LocalizationHelper } = require("devtools/shared/l10n");
 
 const L10N = new LocalizationHelper(

devtools/client/jsonview/converter-child.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { components, Ci, Cr, Cu, CC } = require("chrome");
-
 loader.lazyRequireGetter(
   this,
   "NetworkHelper",
@@ -22,12 +20,12 @@ const {
   removeThemeObserver,
 } = require("devtools/client/shared/theme");
 
-const BinaryInput = CC(
+const BinaryInput = Components.Constructor(
   "@mozilla.org/binaryinputstream;1",
   "nsIBinaryInputStream",
   "setInputStream"
 );
-const BufferStream = CC(
+const BufferStream = Components.Constructor(
   "@mozilla.org/io/arraybuffer-input-stream;1",
   "nsIArrayBufferInputStream",
   "setData"
@@ -128,7 +126,7 @@ Converter.prototype = {
 
     // Initialize stuff.
     const win = NetworkHelper.getWindowForRequest(request);
-    if (!win || !components.isSuccessCode(request.status)) {
+    if (!win || !Components.isSuccessCode(request.status)) {
       return;
     }
 
@@ -154,7 +152,7 @@ Converter.prototype = {
 
   onStopRequest(request, statusCode) {
     // Flush data if we haven't been canceled.
-    if (components.isSuccessCode(statusCode)) {
+    if (Components.isSuccessCode(statusCode)) {
       this.decodeAndInsertBuffer(new ArrayBuffer(0), true);
     }
 

devtools/client/memory/utils.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Cc, Ci } = require("chrome");
-
 const { LocalizationHelper } = require("devtools/shared/l10n");
 const STRINGS_URI = "devtools/client/locales/memory.properties";
 const L10N = (exports.L10N = new LocalizationHelper(STRINGS_URI));

devtools/client/menus.js

@@ -25,8 +25,6 @@
  *   toggle it.
  */
 
-const { Cu } = require("chrome");
-
 const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   BrowserToolboxLauncher:

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

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

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

@@ -4,11 +4,10 @@
 
 "use strict";
 
-const { Ci, Cc, CC } = require("chrome");
 const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.sys.mjs");
 
 XPCOMUtils.defineLazyGetter(this, "ZipWriter", function() {
-  return CC("@mozilla.org/zipwriter;1", "nsIZipWriter");
+  return Components.Constructor("@mozilla.org/zipwriter;1", "nsIZipWriter");
 });
 
 const OPEN_FLAGS = {

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

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

devtools/client/netmonitor/test/sjs_method-test-server.sjs

@@ -3,8 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const CC = Components.Constructor;
-const BinaryInputStream = CC(
+const BinaryInputStream = Components.Constructor(
   "@mozilla.org/binaryinputstream;1",
   "nsIBinaryInputStream",
   "setInputStream"

devtools/client/performance-new/@types/gecko.d.ts

@@ -371,7 +371,6 @@ declare var ChromeUtils: MockedExports.ChromeUtils;
 declare var PathUtils: PathUtilsInterface;
 
 // These global objects can be used directly in JSM files only.
-// In a CommonJS context you need to import them with `require("chrome")`.
 declare var Cu: MockedExports.Cu;
 declare var Cc: MockedExports.Cc;
 declare var Ci: MockedExports.Ci;

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

@@ -67,7 +67,6 @@ const AboutProfiling = React.createFactory(
 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");
 
 /**
  * Initialize the panel by creating a redux store, and render the root component.

devtools/client/performance-new/browser.js

@@ -21,14 +21,6 @@
  * * @typedef {import("./@types/perf").ProfilerViewMode} ProfilerViewMode
  */
 
-const { createLazyLoaders } = ChromeUtils.import(
-  "resource://devtools/client/performance-new/typescript-lazy-load.jsm.js"
-);
-
-const lazy = createLazyLoaders({
-  Chrome: () => require("chrome"),
-});
-
 /** @type {PerformancePref["UIBaseUrl"]} */
 const UI_BASE_URL_PREF = "devtools.performance.recording.ui-base-url";
 /** @type {PerformancePref["UIBaseUrlPathPref"]} */
@@ -145,7 +137,6 @@ function sharedLibrariesFromProfile(profile) {
  * @type {RestartBrowserWithEnvironmentVariable}
  */
 function restartBrowserWithEnvironmentVariable(envName, value) {
-  const { Cc, Ci } = lazy.Chrome();
   const env = Cc["@mozilla.org/process/environment;1"].getService(
     Ci.nsIEnvironment
   );
@@ -162,7 +153,6 @@ function restartBrowserWithEnvironmentVariable(envName, value) {
  * @type {GetEnvironmentVariable}
  */
 function getEnvironmentVariable(envName) {
-  const { Cc, Ci } = lazy.Chrome();
   const env = Cc["@mozilla.org/process/environment;1"].getService(
     Ci.nsIEnvironment
   );
@@ -175,7 +165,6 @@ function getEnvironmentVariable(envName) {
  * @param {(objdirs: string[]) => unknown} changeObjdirs
  */
 function openFilePickerForObjdir(window, objdirs, changeObjdirs) {
-  const { Cc, Ci } = lazy.Chrome();
   const FilePicker = Cc["@mozilla.org/filepicker;1"].createInstance(
     Ci.nsIFilePicker
   );

devtools/client/shared/redux/middleware/performance-marker.js

@@ -3,8 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { Cu } = require("chrome");
-
 /**
  * This function returns a middleware, which is responsible for adding markers that will
  * be visible in performance profiles, and may help investigate performance issues.

devtools/client/shared/remote-debugging/adb/adb-process.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cc, Ci } = require("chrome");
 const { dumpn } = require("devtools/shared/DevToolsUtils");
 const EventEmitter = require("devtools/shared/event-emitter");
 const {

devtools/client/shared/remote-debugging/adb/adb-socket.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cu } = require("chrome");
 const { dumpn } = require("devtools/shared/DevToolsUtils");
 
 function createTCPSocket(location, port, options) {

devtools/client/shared/remote-debugging/adb/commands/prepare-tcp-connection.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cc, Ci } = require("chrome");
 const { dumpn } = require("devtools/shared/DevToolsUtils");
 const {
   runCommand,

devtools/client/shared/screenshot.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cc, Ci } = require("chrome");
 const { LocalizationHelper } = require("devtools/shared/l10n");
 
 loader.lazyImporter(this, "Downloads", "resource://gre/modules/Downloads.jsm");

devtools/client/shared/test/highlighter-test-actor.js

@@ -8,7 +8,6 @@
 // A helper actor for testing highlighters.
 // ⚠️ This should only be used for getting data for objects using CanvasFrameAnonymousContentHelper,
 // that we can't get directly from tests.
-const { Ci, Cc } = require("chrome");
 const { getRect, getAdjustedQuads } = require("devtools/shared/layout/utils");
 
 // Set up a dummy environment so that EventUtils works. We need to be careful to

devtools/client/shared/test/shared-head.js

@@ -2003,7 +2003,7 @@ async function closeRDM(tab, options) {
 }
 
 function getInputStream(data) {
-  const BufferStream = CC(
+  const BufferStream = Components.Constructor(
     "@mozilla.org/io/arraybuffer-input-stream;1",
     "nsIArrayBufferInputStream",
     "setData"

devtools/client/shared/unicode-url.js

@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { Cc, Ci } = require("chrome");
 const idnService = Cc["@mozilla.org/network/idn-service;1"].getService(
   Ci.nsIIDNService
 );

devtools/client/shared/webgl-utils.js

@@ -3,8 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { Cc, Ci } = require("chrome");
-
 const WEBGL_CONTEXT_NAME = "experimental-webgl";
 
 function isWebGLForceEnabled() {

devtools/client/shared/widgets/view-helpers.js

@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { Cu } = require("chrome");
 const { KeyCodes } = require("devtools/client/shared/keycodes");
 
 const PANE_APPEARANCE_DELAY = 50;

devtools/client/styleeditor/StyleSheetEditor.sys.mjs

@@ -16,9 +16,7 @@ const EventEmitter = require("devtools/shared/event-emitter");
 const lazy = {};
 
 loader.lazyGetter(lazy, "BufferStream", () => {
-  const { CC } = require("chrome");
-
-  return CC(
+  return Components.Constructor(
     "@mozilla.org/io/arraybuffer-input-stream;1",
     "nsIArrayBufferInputStream",
     "setData"

devtools/client/webconsole/test/node/mocha-test-setup.js

@@ -109,7 +109,11 @@ global.ChromeUtils = {
   addProfilerMarker: () => {},
 };
 
-global.Cu = { isInAutomation: true };
+global.Cc = {};
+global.Ci = {};
+global.Cu = { isInAutomation: true, now: () => {} };
+global.Components = { stack: { caller: "" } };
+
 global.define = function() {};
 
 // Used for the HTMLTooltip component.
@@ -138,8 +142,6 @@ requireHacker.global_hook("default", (path, module) => {
         "devtools/client/webconsole/test/browser/stub-generator-helpers"
       ),
 
-    chrome: () =>
-      `module.exports = { Cc: {}, Ci: {}, Cu: { now: () => {}}, components: {stack: {caller: ""}} }`,
     // Some modules depend on Chrome APIs which don't work in mocha. When such a module
     // is required, replace it with a mock version.
     "devtools/server/devtools-server": () =>

devtools/client/webconsole/utils.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Cc, Ci } = require("chrome");
-
 // Number of terminal entries for the self-xss prevention to go away
 const CONSOLE_ENTRY_THRESHOLD = 5;
 

devtools/server/actors/accessibility/accessible.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Ci, Cu } = require("chrome");
 const { Actor, ActorClassWithSpec } = require("devtools/shared/protocol");
 const { accessibleSpec } = require("devtools/shared/specs/accessibility");
 const {

devtools/server/actors/accessibility/audit/keyboard.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Ci, Cu } = require("chrome");
 loader.lazyRequireGetter(
   this,
   "CssLogic",

devtools/server/actors/accessibility/audit/text-label.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Ci } = require("chrome");
-
 const {
   accessibility: {
     AUDIT_TYPE: { TEXT_LABEL },

devtools/server/actors/accessibility/parent-accessibility.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cc, Ci } = require("chrome");
 const { Actor, ActorClassWithSpec } = require("devtools/shared/protocol");
 const {
   parentAccessibilitySpec,

devtools/server/actors/accessibility/walker.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cc, Ci } = require("chrome");
 const { Actor, ActorClassWithSpec } = require("devtools/shared/protocol");
 const { accessibleWalkerSpec } = require("devtools/shared/specs/accessibility");
 const {

devtools/server/actors/addon/webextension-inspected-window.js

@@ -6,8 +6,6 @@
 
 const protocol = require("devtools/shared/protocol");
 
-const { Cc, Ci, Cu, Cr } = require("chrome");
-
 const { DevToolsServer } = require("devtools/server/devtools-server");
 
 loader.lazyGetter(

devtools/server/actors/animation.js

@@ -25,7 +25,6 @@
  *   /dom/webidl/Animation*.webidl
  */
 
-const { Cu } = require("chrome");
 const protocol = require("devtools/shared/protocol");
 const { Actor } = protocol;
 const {

devtools/server/actors/descriptors/process.js

@@ -22,7 +22,6 @@
  */
 
 const { DevToolsServer } = require("devtools/server/devtools-server");
-const { Cc, Ci } = require("chrome");
 
 const {
   createBrowserSessionContext,

devtools/server/actors/descriptors/tab.js

@@ -12,7 +12,6 @@
  * See devtools/docs/backend/actor-hierarchy.md for more details.
  */
 
-const { Ci } = require("chrome");
 const {
   connectToFrame,
 } = require("devtools/server/connectors/frame-connector");

devtools/server/actors/descriptors/worker.js

@@ -14,7 +14,6 @@
 // error packets.
 /* eslint-disable no-throw-literal */
 
-const { Ci } = require("chrome");
 const { DevToolsServer } = require("devtools/server/devtools-server");
 const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.sys.mjs");
 const protocol = require("devtools/shared/protocol");

devtools/server/actors/device.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Ci, Cc } = require("chrome");
 const protocol = require("devtools/shared/protocol");
 
 const { DevToolsServer } = require("devtools/server/devtools-server");

devtools/server/actors/frame.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cu } = require("chrome");
 const Debugger = require("Debugger");
 const { assert } = require("devtools/shared/DevToolsUtils");
 const { Pool } = require("devtools/shared/protocol/Pool");

devtools/server/actors/highlighters.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Ci, Cu } = require("chrome");
-
 const EventEmitter = require("devtools/shared/event-emitter");
 const protocol = require("devtools/shared/protocol");
 const { customHighlighterSpec } = require("devtools/shared/specs/highlighters");

devtools/server/actors/highlighters/auto-refresh.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cu } = require("chrome");
 const EventEmitter = require("devtools/shared/event-emitter");
 const {
   isNodeValid,

devtools/server/actors/highlighters/eye-dropper.js

@@ -8,7 +8,6 @@
 // It basically displays a magnifier that tracks mouse moves and shows a magnified version
 // of the page. On click, it samples the color at the pixel being hovered.
 
-const { Ci, Cc } = require("chrome");
 const {
   CanvasFrameAnonymousContentHelper,
 } = require("devtools/server/actors/highlighters/utils/markup");

devtools/server/actors/highlighters/utils/markup.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cu, Cr } = require("chrome");
 const {
   getCurrentZoom,
   getWindowDimensions,

devtools/server/actors/inspector/css-logic.js

@@ -27,7 +27,6 @@
 
 "use strict";
 
-const { Cu } = require("chrome");
 const nodeConstants = require("devtools/shared/dom-node-constants");
 const {
   getBindingElementAndPseudo,

devtools/server/actors/inspector/custom-element-watcher.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cu } = require("chrome");
 const InspectorUtils = require("InspectorUtils");
 const EventEmitter = require("devtools/shared/event-emitter");
 

devtools/server/actors/inspector/document-walker.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Cc, Ci, Cu } = require("chrome");
-
 loader.lazyRequireGetter(
   this,
   "isShadowRoot",

devtools/server/actors/inspector/event-collector.js

@@ -7,7 +7,6 @@
 
 "use strict";
 
-const { Cu } = require("chrome");
 const {
   isAfterPseudoElement,
   isBeforePseudoElement,

devtools/server/actors/inspector/node-picker.js

@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
-const { Ci } = require("chrome");
 
 loader.lazyRequireGetter(
   this,

devtools/server/actors/inspector/node.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cu } = require("chrome");
 const InspectorUtils = require("InspectorUtils");
 const protocol = require("devtools/shared/protocol");
 const { PSEUDO_CLASSES } = require("devtools/shared/css/constants");

devtools/server/actors/inspector/utils.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Cu, Ci } = require("chrome");
-
 loader.lazyRequireGetter(this, "colorUtils", "devtools/shared/css/color", true);
 loader.lazyRequireGetter(this, "AsyncUtils", "devtools/shared/async-utils");
 loader.lazyRequireGetter(this, "flags", "devtools/shared/flags");

devtools/server/actors/inspector/walker.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Ci, Cu } = require("chrome");
-
 const protocol = require("devtools/shared/protocol");
 const { walkerSpec } = require("devtools/shared/specs/walker");
 const { LongStringActor } = require("devtools/server/actors/string");

devtools/server/actors/layout.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cu } = require("chrome");
 const { Actor, ActorClassWithSpec } = require("devtools/shared/protocol");
 const {
   flexboxSpec,

devtools/server/actors/media-rule.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cu } = require("chrome");
 const protocol = require("devtools/shared/protocol");
 const { mediaRuleSpec } = require("devtools/shared/specs/media-rule");
 const InspectorUtils = require("InspectorUtils");

devtools/server/actors/network-monitor/channel-event-sink.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cc, Ci, Cm, Cr, components } = require("chrome");
 const { ComponentUtils } = require("resource://gre/modules/ComponentUtils.jsm");
 
 /**
@@ -12,7 +11,7 @@ const { ComponentUtils } = require("resource://gre/modules/ComponentUtils.jsm");
  * informs the registered StackTraceCollector about the old and new channels.
  */
 const SINK_CLASS_DESCRIPTION = "NetworkMonitor Channel Event Sink";
-const SINK_CLASS_ID = components.ID("{e89fa076-c845-48a8-8c45-2604729eba1d}");
+const SINK_CLASS_ID = Components.ID("{e89fa076-c845-48a8-8c45-2604729eba1d}");
 const SINK_CONTRACT_ID = "@mozilla.org/network/monitor/channeleventsink;1";
 const SINK_CATEGORY_NAME = "net-channel-event-sinks";
 
@@ -57,7 +56,7 @@ const ChannelEventSinkFactory = ComponentUtils.generateSingletonFactory(
 );
 
 ChannelEventSinkFactory.register = function() {
-  const registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
+  const registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
   if (registrar.isCIDRegistered(SINK_CLASS_ID)) {
     return;
   }
@@ -79,7 +78,7 @@ ChannelEventSinkFactory.register = function() {
 };
 
 ChannelEventSinkFactory.unregister = function() {
-  const registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
+  const registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
   registrar.unregisterFactory(SINK_CLASS_ID, ChannelEventSinkFactory);
 
   Services.catMan.deleteCategoryEntry(

devtools/server/actors/network-monitor/eventsource-actor.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cc, Ci } = require("chrome");
 const { Actor, ActorClassWithSpec } = require("devtools/shared/protocol");
 const { eventSourceSpec } = require("devtools/shared/specs/eventsource");
 const { LongStringActor } = require("devtools/server/actors/string");

devtools/server/actors/network-monitor/network-content.js

@@ -7,8 +7,6 @@
 const { ActorClassWithSpec, Actor } = require("devtools/shared/protocol");
 const { networkContentSpec } = require("devtools/shared/specs/network-content");
 
-const { Cc, Ci } = require("chrome");
-
 loader.lazyRequireGetter(
   this,
   "NetUtil",

devtools/server/actors/network-monitor/network-observer.js

@@ -12,8 +12,6 @@
 // Enable logging all platform events this module listen to
 const DEBUG_PLATFORM_EVENTS = false;
 
-const { Cc, Ci } = require("chrome");
-
 loader.lazyRequireGetter(
   this,
   "ChannelMap",

devtools/server/actors/network-monitor/network-response-listener.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Cc, Ci, Cr, components: Components } = require("chrome");
-
 loader.lazyRequireGetter(
   this,
   "NetworkHelper",

devtools/server/actors/network-monitor/stack-trace-collector.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Ci, components } = require("chrome");
-
 loader.lazyRequireGetter(
   this,
   "ChannelEventSinkFactory",
@@ -117,7 +115,7 @@ StackTraceCollector.prototype = {
         //
         // Convert the nsIStackFrame XPCOM objects to a nice JSON that can be
         // passed around through message managers etc.
-        let frame = components.stack;
+        let frame = Components.stack;
         if (frame?.caller) {
           frame = frame.caller;
           while (frame) {
@@ -142,7 +140,7 @@ StackTraceCollector.prototype = {
         //
         // - The HTTP channel is opened asynchronously or on a different thread
         //   from the code which triggered its creation, in which case the stack
-        //   from components.stack will be empty. The alternate stack will be
+        //   from Components.stack will be empty. The alternate stack will be
         //   for the point we want to associate with the channel.
         //
         // - The channel is not a nsIHttpChannel, and we will receive no

devtools/server/actors/network-monitor/utils/network-utils.js

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

devtools/server/actors/network-monitor/websocket-actor.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cc, Ci } = require("chrome");
 const { Actor, ActorClassWithSpec } = require("devtools/shared/protocol");
 const { webSocketSpec } = require("devtools/shared/specs/websocket");
 const { LongStringActor } = require("devtools/server/actors/string");

devtools/server/actors/object.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cu } = require("chrome");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 const { assert } = DevToolsUtils;
 

devtools/server/actors/object/previewers.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cu, Ci } = require("chrome");
 const { DevToolsServer } = require("devtools/server/devtools-server");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 loader.lazyRequireGetter(

devtools/server/actors/object/property-iterator.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cu } = require("chrome");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 const protocol = require("devtools/shared/protocol");
 const {

devtools/server/actors/object/utils.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cu } = require("chrome");
 const { DevToolsServer } = require("devtools/server/devtools-server");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 const { assert } = DevToolsUtils;

devtools/server/actors/process.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Cc } = require("chrome");
-
 loader.lazyGetter(this, "ppmm", () => {
   return Cc["@mozilla.org/parentprocessmessagemanager;1"].getService();
 });

devtools/server/actors/resources/css-messages.js

@@ -5,7 +5,6 @@
 "use strict";
 
 const nsIConsoleListenerWatcher = require("devtools/server/actors/resources/utils/nsi-console-listener-watcher");
-const { Ci } = require("chrome");
 const { DevToolsServer } = require("devtools/server/devtools-server");
 const { createStringGrip } = require("devtools/server/actors/object/utils");
 const {

devtools/server/actors/resources/error-messages.js

@@ -5,7 +5,6 @@
 "use strict";
 
 const nsIConsoleListenerWatcher = require("devtools/server/actors/resources/utils/nsi-console-listener-watcher");
-const { Ci } = require("chrome");
 const { DevToolsServer } = require("devtools/server/devtools-server");
 const ErrorDocs = require("devtools/server/actors/errordocs");
 const {

devtools/server/actors/resources/network-events-content.js

@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
-const { Ci } = require("chrome");
 
 loader.lazyRequireGetter(
   this,

devtools/server/actors/resources/network-events-stacktraces.js

@@ -8,8 +8,6 @@ const {
   TYPES: { NETWORK_EVENT_STACKTRACE },
 } = require("devtools/server/actors/resources/index");
 
-const { Ci, components } = require("chrome");
-
 loader.lazyRequireGetter(
   this,
   "ChannelEventSinkFactory",
@@ -135,7 +133,7 @@ class NetworkEventStackTracesWatcher {
         //
         // Convert the nsIStackFrame XPCOM objects to a nice JSON that can be
         // passed around through message managers etc.
-        let frame = components.stack;
+        let frame = Components.stack;
         if (frame?.caller) {
           frame = frame.caller;
           while (frame) {
@@ -160,7 +158,7 @@ class NetworkEventStackTracesWatcher {
         //
         // - The HTTP channel is opened asynchronously or on a different thread
         //   from the code which triggered its creation, in which case the stack
-        //   from components.stack will be empty. The alternate stack will be
+        //   from Components.stack will be empty. The alternate stack will be
         //   for the point we want to associate with the channel.
         //
         // - The channel is not a nsIHttpChannel, and we will receive no

devtools/server/actors/resources/parent-process-document-event.js

@@ -7,7 +7,6 @@
 const {
   TYPES: { DOCUMENT_EVENT },
 } = require("devtools/server/actors/resources/index");
-const { Ci } = require("chrome");
 const isEveryFrameTargetEnabled = Services.prefs.getBoolPref(
   "devtools.every-frame-target.enabled",
   false

devtools/server/actors/resources/platform-messages.js

@@ -5,7 +5,6 @@
 "use strict";
 
 const nsIConsoleListenerWatcher = require("devtools/server/actors/resources/utils/nsi-console-listener-watcher");
-const { Ci } = require("chrome");
 
 const {
   TYPES: { PLATFORM_MESSAGE },

devtools/server/actors/resources/server-sent-events.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Cc, Ci } = require("chrome");
-
 const { LongStringActor } = require("devtools/server/actors/string");
 
 const {

devtools/server/actors/resources/utils/content-process-storage.js

@@ -6,7 +6,6 @@
 
 const { storageTypePool } = require("devtools/server/actors/storage");
 const EventEmitter = require("devtools/shared/event-emitter");
-const { Ci } = require("chrome");
 
 loader.lazyRequireGetter(
   this,

devtools/server/actors/resources/utils/nsi-console-listener-watcher.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Ci, Cu } = require("chrome");
-
 const { createStringGrip } = require("devtools/server/actors/object/utils");
 
 const {

devtools/server/actors/resources/websockets.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Cc, Ci } = require("chrome");
-
 const { LongStringActor } = require("devtools/server/actors/string");
 
 const {

devtools/server/actors/root.js

@@ -8,7 +8,6 @@
 // error packets.
 /* eslint-disable no-throw-literal */
 
-const { Cu } = require("chrome");
 const { Pool } = require("devtools/shared/protocol");
 const {
   LazyPool,

devtools/server/actors/storage.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Cc, Ci, Cu, CC } = require("chrome");
 const protocol = require("devtools/shared/protocol");
 const { LongStringActor } = require("devtools/server/actors/string");
 const { DevToolsServer } = require("devtools/server/devtools-server");
@@ -62,7 +61,10 @@ loader.lazyGetter(this, "indexedDBForStorage", () => {
   // On xpcshell, we can't instantiate indexedDB without crashing
   try {
     const sandbox = Cu.Sandbox(
-      CC("@mozilla.org/systemprincipal;1", "nsIPrincipal")(),
+      Components.Constructor(
+        "@mozilla.org/systemprincipal;1",
+        "nsIPrincipal"
+      )(),
       { wantGlobalProperties: ["indexedDB"] }
     );
     return sandbox.indexedDB;

devtools/server/actors/style-sheet.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Ci } = require("chrome");
 const protocol = require("devtools/shared/protocol");
 const { LongStringActor } = require("devtools/server/actors/string");
 const { MediaRuleActor } = require("devtools/server/actors/media-rule");

devtools/server/actors/target-configuration.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Ci } = require("chrome");
 const { ActorClassWithSpec, Actor } = require("devtools/shared/protocol");
 const {
   targetConfigurationSpec,

devtools/server/actors/targets/content-process.js

@@ -11,8 +11,6 @@
  * See devtools/docs/backend/actor-hierarchy.md for more details.
  */
 
-const { Cc, Ci, Cu } = require("chrome");
-
 const { ThreadActor } = require("devtools/server/actors/thread");
 const { WebConsoleActor } = require("devtools/server/actors/webconsole");
 const makeDebugger = require("devtools/server/actors/utils/make-debugger");

devtools/server/actors/targets/parent-process.js

@@ -13,7 +13,6 @@
  * See devtools/docs/backend/actor-hierarchy.md for more details.
  */
 
-const { Ci } = require("chrome");
 const { DevToolsServer } = require("devtools/server/devtools-server");
 const {
   getChildDocShells,

devtools/server/actors/targets/webextension.js

@@ -13,7 +13,6 @@
  */
 
 const { extend } = require("devtools/shared/extend");
-const { Ci, Cu } = require("chrome");
 
 const {
   ParentProcessTargetActor,

devtools/server/actors/targets/window-global.js

@@ -21,7 +21,6 @@
  * debug a document living in the parent process.
  */
 
-var { Ci, Cu, Cr, Cc } = require("chrome");
 var { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 var { assert } = DevToolsUtils;

devtools/server/actors/thread.js

@@ -9,7 +9,6 @@
 /* eslint-disable no-throw-literal */
 
 const DebuggerNotificationObserver = require("DebuggerNotificationObserver");
-const { Cr, Ci } = require("chrome");
 const { Pool } = require("devtools/shared/protocol/Pool");
 const { createValueGrip } = require("devtools/server/actors/object/utils");
 const { ActorClassWithSpec, Actor } = require("devtools/shared/protocol");

devtools/server/actors/utils/accessibility.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-loader.lazyRequireGetter(this, "Ci", "chrome", true);
 loader.lazyRequireGetter(
   this,
   ["loadSheet", "removeSheet"],

devtools/server/actors/utils/css-grid-utils.js

@@ -4,8 +4,6 @@
 
 "use strict";
 
-const { Cu } = require("chrome");
-
 /**
  * Returns the grid fragment array with all the grid fragment data stringifiable.
  *

devtools/server/actors/utils/event-loop.js

@@ -5,7 +5,6 @@
 "use strict";
 
 const xpcInspector = require("xpcInspector");
-const { Cu } = require("chrome");
 
 /**
  * An object that represents a nested event loop. It is used as the nest

devtools/server/actors/utils/sources-manager.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-const { Ci } = require("chrome");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 const { assert, fetch } = DevToolsUtils;
 const EventEmitter = require("devtools/shared/event-emitter");

devtools/server/actors/utils/stylesheets-manager.js

@@ -5,7 +5,6 @@
 "use strict";
 
 const EventEmitter = require("devtools/shared/event-emitter");
-const { Ci } = require("chrome");
 const { fetch } = require("devtools/shared/DevToolsUtils");
 const InspectorUtils = require("InspectorUtils");
 const {

devtools/server/actors/webbrowser.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-var { Ci } = require("chrome");
 var { DevToolsServer } = require("devtools/server/devtools-server");
 var { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");

devtools/server/actors/webconsole.js

@@ -9,7 +9,6 @@
 const { ActorClassWithSpec, Actor } = require("devtools/shared/protocol");
 const { webconsoleSpec } = require("devtools/shared/specs/webconsole");
 
-const { Cc, Ci, Cu } = require("chrome");
 const { DevToolsServer } = require("devtools/server/devtools-server");
 const { ThreadActor } = require("devtools/server/actors/thread");
 const { ObjectActor } = require("devtools/server/actors/object");