# HG changeset patch
# User Kris Maglione <maglione.k@gmail.com>
# Date 1517268018 28800
# Node ID e6a7b5e11ba856ee3535f76c6bcca17ea29e3d5f
# Parent  1fde7dff694b30e495b7d5aafaba19c74088a9f3
Bug 1431533: Part 5a - Auto-rewrite code to use ChromeUtils import methods. r=florian

This was done using the following script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/37e3803c7a23385bab5ea077ba8692bcfe1608fc/processors/chromeutils-import.jsm

MozReview-Commit-ID: 1Nc3XDu0wGl

diff --git a/browser/components/customizableui/test/browser_989751_subviewbutton_class.js b/browser/components/customizableui/test/browser_989751_subviewbutton_class.js
--- a/browser/components/customizableui/test/browser_989751_subviewbutton_class.js
+++ b/browser/components/customizableui/test/browser_989751_subviewbutton_class.js
@@ -13,17 +13,17 @@ function insertClassNameToMenuChildren(p
   el.classList.add(kCustomClass);
   tempElement = el;
 }
 
 function checkSubviewButtonClass(menuId, buttonId, subviewId) {
   return async function() {
     // Initialize DevTools before starting the test in order to create menuitems in
     // menuWebDeveloperPopup.
-    Cu.import("resource://devtools/shared/Loader.jsm", {})
+    ChromeUtils.import("resource://devtools/shared/Loader.jsm", {})
         .require("devtools/client/framework/devtools-browser");
 
     info("Checking for items without the subviewbutton class in " + buttonId + " widget");
     let menu = document.getElementById(menuId);
     insertClassNameToMenuChildren(menu);
 
     let placement = CustomizableUI.getPlacementOfWidget(buttonId);
     let changedPlacement = false;
diff --git a/browser/components/extensions/test/browser/browser_ext_devtools_panels_elements_sidebar.js b/browser/components/extensions/test/browser/browser_ext_devtools_panels_elements_sidebar.js
--- a/browser/components/extensions/test/browser/browser_ext_devtools_panels_elements_sidebar.js
+++ b/browser/components/extensions/test/browser/browser_ext_devtools_panels_elements_sidebar.js
@@ -1,18 +1,18 @@
 /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
-XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
-                                  "resource://devtools/client/framework/gDevTools.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "devtools",
-                                  "resource://devtools/shared/Loader.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "ContentTaskUtils",
-                                  "resource://testing-common/ContentTaskUtils.jsm");
+ChromeUtils.defineModuleGetter(this, "gDevTools",
+                               "resource://devtools/client/framework/gDevTools.jsm");
+ChromeUtils.defineModuleGetter(this, "devtools",
+                               "resource://devtools/shared/Loader.jsm");
+ChromeUtils.defineModuleGetter(this, "ContentTaskUtils",
+                               "resource://testing-common/ContentTaskUtils.jsm");
 
 function isActiveSidebarTabTitle(inspector, expectedTabTitle, message) {
   const actualTabTitle = inspector.panelDoc.querySelector(".tabs-menu-item.is-active").innerText;
   is(actualTabTitle, expectedTabTitle, message);
 }
 
 add_task(async function test_devtools_panels_elements_sidebar() {
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://mochi.test:8888/");
diff --git a/browser/components/extensions/test/browser/browser_ext_openPanel.js b/browser/components/extensions/test/browser/browser_ext_openPanel.js
--- a/browser/components/extensions/test/browser/browser_ext_openPanel.js
+++ b/browser/components/extensions/test/browser/browser_ext_openPanel.js
@@ -1,14 +1,14 @@
 /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
 add_task(async function test_openPopup_requires_user_interaction() {
-  const {GlobalManager} = Cu.import("resource://gre/modules/Extension.jsm", {});
+  const {GlobalManager} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
 
   async function backgroundScript() {
     browser.tabs.onUpdated.addListener(async (tabId, changeInfo, tabInfo) => {
       if (changeInfo.status != "complete") {
         return;
       }
       await browser.pageAction.show(tabId);
 
diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_update_url.js b/browser/components/extensions/test/browser/browser_ext_tabs_update_url.js
--- a/browser/components/extensions/test/browser/browser_ext_tabs_update_url.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_update_url.js
@@ -1,16 +1,16 @@
 /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
-XPCOMUtils.defineLazyModuleGetter(this, "SessionStore",
-                                  "resource:///modules/sessionstore/SessionStore.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "TabStateFlusher",
-                                  "resource:///modules/sessionstore/TabStateFlusher.jsm");
+ChromeUtils.defineModuleGetter(this, "SessionStore",
+                               "resource:///modules/sessionstore/SessionStore.jsm");
+ChromeUtils.defineModuleGetter(this, "TabStateFlusher",
+                               "resource:///modules/sessionstore/TabStateFlusher.jsm");
 
 async function testTabsUpdateURL(existentTabURL, tabsUpdateURL, isErrorExpected) {
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "permissions": ["tabs"],
     },
 
     files: {
diff --git a/browser/components/extensions/test/browser/head_webNavigation.js b/browser/components/extensions/test/browser/head_webNavigation.js
--- a/browser/components/extensions/test/browser/head_webNavigation.js
+++ b/browser/components/extensions/test/browser/head_webNavigation.js
@@ -28,12 +28,12 @@ async function runCreatedNavigationTarge
 }
 
 
 // Test that there are no pending createdNavigationTarget messages still tracked
 // in WebNavigation.jsm (to be called before the extension is unloaded, because
 // once the last extension which have subscribed a webNavigation event is unloaded
 // all the pending created navigation target data is completely cleared).
 function assertNoPendingCreatedNavigationTargetData() {
-  const {Manager} = Cu.import("resource://gre/modules/WebNavigation.jsm", {});
+  const {Manager} = ChromeUtils.import("resource://gre/modules/WebNavigation.jsm", {});
   Assert.equal(Manager.createdNavigationTargetByOuterWindowId.size, 0,
                "There should be no pending createdNavigationTarget messages in WebNavigation");
 }
diff --git a/browser/components/preferences/in-content-new/tests/browser_permissions_dialog.js b/browser/components/preferences/in-content-new/tests/browser_permissions_dialog.js
--- a/browser/components/preferences/in-content-new/tests/browser_permissions_dialog.js
+++ b/browser/components/preferences/in-content-new/tests/browser_permissions_dialog.js
@@ -1,16 +1,16 @@
 "use strict";
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
-Components.utils.import("resource:///modules/SitePermissions.jsm");
-Components.utils.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource:///modules/SitePermissions.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const PERMISSIONS_URL = "chrome://browser/content/preferences/sitePermissions.xul";
 const URL = "http://www.example.com";
 const URI = Services.io.newURI(URL);
 var sitePermissionsDialog;
 
 function checkPermissionItem(origin, state) {
   let doc = sitePermissionsDialog.document;
diff --git a/browser/components/preferences/sitePermissions.js b/browser/components/preferences/sitePermissions.js
--- a/browser/components/preferences/sitePermissions.js
+++ b/browser/components/preferences/sitePermissions.js
@@ -1,15 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
-Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/AppConstants.jsm");
-Components.utils.import("resource:///modules/SitePermissions.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+ChromeUtils.import("resource:///modules/SitePermissions.jsm");
 
 function Permission(principal, type, capability, capabilityString) {
   this.principal = principal;
   this.origin = principal.origin;
   this.type = type;
   this.capability = capability;
   this.capabilityString = capabilityString;
 }
diff --git a/browser/components/shell/HeadlessShell.jsm b/browser/components/shell/HeadlessShell.jsm
--- a/browser/components/shell/HeadlessShell.jsm
+++ b/browser/components/shell/HeadlessShell.jsm
@@ -1,19 +1,19 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 "use strict";
 
 var EXPORTED_SYMBOLS = ["HeadlessShell"];
 
-Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://gre/modules/osfile.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+ChromeUtils.import("resource://gre/modules/osfile.jsm");
 
 const Ci = Components.interfaces;
 
 // Refrences to the progress listeners to keep them from being gc'ed
 // before they are called.
 const progressListeners = new Map();
 
 function loadContentWindow(webNavigation, uri) {
diff --git a/browser/components/shell/test/test_headless_screenshot.html b/browser/components/shell/test/test_headless_screenshot.html
--- a/browser/components/shell/test/test_headless_screenshot.html
+++ b/browser/components/shell/test/test_headless_screenshot.html
@@ -4,19 +4,19 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=1378010
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 1378010</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <script type="application/javascript">
-  Components.utils.import("resource://gre/modules/Services.jsm");
-  Components.utils.import("resource://gre/modules/Subprocess.jsm");
-  Components.utils.import("resource://gre/modules/osfile.jsm");
+  ChromeUtils.import("resource://gre/modules/Services.jsm");
+  ChromeUtils.import("resource://gre/modules/Subprocess.jsm");
+  ChromeUtils.import("resource://gre/modules/osfile.jsm");
 
   SimpleTest.requestLongerTimeout(2);
 
   const screenshotPath = OS.Path.join(OS.Constants.Path.tmpDir, "headless_test_screenshot.png");
 
   async function runFirefox(args) {
     const Ci = Components.interfaces;
     const XRE_EXECUTABLE_FILE = "XREExeF";
diff --git a/browser/components/tests/unit/test_distribution_cachedexistence.js b/browser/components/tests/unit/test_distribution_cachedexistence.js
--- a/browser/components/tests/unit/test_distribution_cachedexistence.js
+++ b/browser/components/tests/unit/test_distribution_cachedexistence.js
@@ -8,25 +8,25 @@
  */
 
 const PREF_CACHED_FILE_EXISTENCE  = "distribution.iniFile.exists.value";
 const PREF_CACHED_FILE_APPVERSION = "distribution.iniFile.exists.appversion";
 const PREF_LOAD_FROM_PROFILE      = "distribution.testing.loadFromProfile";
 
 const gTestDir = do_get_cwd();
 
-Cu.import("resource://gre/modules/AppConstants.jsm");
+ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 
 add_task(async function() {
   // Start with a clean slate of the prefs that control this feature.
   Services.prefs.clearUserPref(PREF_CACHED_FILE_APPVERSION);
   Services.prefs.clearUserPref(PREF_CACHED_FILE_EXISTENCE);
   setupTest();
 
-  let {DistributionCustomizer} = Cu.import("resource:///modules/distribution.js", {});
+  let {DistributionCustomizer} = ChromeUtils.import("resource:///modules/distribution.js", {});
   let distribution = new DistributionCustomizer();
 
   copyDistributionToProfile();
 
   // Check that checking for distribution.ini returns the right value and sets up
   // the cached prefs.
   let exists = distribution._hasDistributionIni;
 
diff --git a/browser/extensions/formautofill/test/browser/head.js b/browser/extensions/formautofill/test/browser/head.js
--- a/browser/extensions/formautofill/test/browser/head.js
+++ b/browser/extensions/formautofill/test/browser/head.js
@@ -130,17 +130,17 @@ function getDisplayedPopupItems(browser,
 async function sleep(ms = 500) {
   await new Promise(resolve => setTimeout(resolve, ms));
 }
 
 async function focusAndWaitForFieldsIdentified(browser, selector) {
   info("expecting the target input being focused and indentified");
   /* eslint no-shadow: ["error", { "allow": ["selector", "previouslyFocused", "previouslyIdentified"] }] */
   const {previouslyFocused, previouslyIdentified} = await ContentTask.spawn(browser, {selector}, async function({selector}) {
-    Components.utils.import("resource://gre/modules/FormLikeFactory.jsm");
+    ChromeUtils.import("resource://gre/modules/FormLikeFactory.jsm");
     const input = content.document.querySelector(selector);
     const rootElement = FormLikeFactory.findRootForField(input);
     const previouslyFocused = content.document.activeElement == input;
     const previouslyIdentified = rootElement.hasAttribute("test-formautofill-identified");
 
     input.focus();
 
     return {previouslyFocused, previouslyIdentified};
@@ -158,17 +158,17 @@ async function focusAndWaitForFieldsIden
         Services.mm.removeMessageListener("FormAutofill:FieldsIdentified", onIdentified);
         resolve();
       });
     });
   }
   // Wait 500ms to ensure that "markAsAutofillField" is completely finished.
   await sleep();
   await ContentTask.spawn(browser, {}, async function() {
-    Components.utils.import("resource://gre/modules/FormLikeFactory.jsm");
+    ChromeUtils.import("resource://gre/modules/FormLikeFactory.jsm");
     FormLikeFactory
       .findRootForField(content.document.activeElement)
       .setAttribute("test-formautofill-identified", "true");
   });
 }
 
 async function expectPopupOpen(browser) {
   const {autoCompletePopup} = browser;
diff --git a/browser/extensions/formautofill/test/unit/test_parseAddressFormat.js b/browser/extensions/formautofill/test/unit/test_parseAddressFormat.js
--- a/browser/extensions/formautofill/test/unit/test_parseAddressFormat.js
+++ b/browser/extensions/formautofill/test/unit/test_parseAddressFormat.js
@@ -1,11 +1,11 @@
 "use strict";
 
-Cu.import("resource://formautofill/FormAutofillUtils.jsm");
+ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
 
 add_task(async function test_parseAddressFormat() {
   const TEST_CASES = [
     {
       fmt: "%N%n%O%n%A%n%C, %S %Z", // US
       parsed: [
         {fieldId: "name", newLine: true},
         {fieldId: "organization", newLine: true},
diff --git a/devtools/client/aboutdebugging/initializer.js b/devtools/client/aboutdebugging/initializer.js
--- a/devtools/client/aboutdebugging/initializer.js
+++ b/devtools/client/aboutdebugging/initializer.js
@@ -2,21 +2,21 @@
  * 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/. */
 
 /* eslint-env browser */
 /* globals Telemetry */
 
 "use strict";
 
-const { loader } = Cu.import(
+const { loader } = ChromeUtils.import(
   "resource://devtools/shared/Loader.jsm", {});
-const { BrowserLoader } = Cu.import(
+const { BrowserLoader } = ChromeUtils.import(
   "resource://devtools/client/shared/browser-loader.js", {});
-const { Services } = Cu.import(
+const { Services } = ChromeUtils.import(
   "resource://gre/modules/Services.jsm", {});
 
 loader.lazyRequireGetter(this, "Telemetry",
   "devtools/client/shared/telemetry");
 
 const { require } = BrowserLoader({
   baseURI: "resource://devtools/client/aboutdebugging/",
   window
diff --git a/devtools/client/aboutdebugging/test/addons/unpacked/bootstrap.js b/devtools/client/aboutdebugging/test/addons/unpacked/bootstrap.js
--- a/devtools/client/aboutdebugging/test/addons/unpacked/bootstrap.js
+++ b/devtools/client/aboutdebugging/test/addons/unpacked/bootstrap.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /* eslint-env browser */
 /* exported startup, shutdown, install, uninstall */
 
 "use strict";
 
-Cu.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 // This function is called from the webconsole test:
 // browser_addons_debug_bootstrapped.js
 function myBootstrapAddonFunction() { // eslint-disable-line no-unused-vars
   Services.obs.notifyObservers(null, "addon-console-works");
 }
 
 function startup() {
diff --git a/devtools/client/debugger/new/index.html b/devtools/client/debugger/new/index.html
--- a/devtools/client/debugger/new/index.html
+++ b/devtools/client/debugger/new/index.html
@@ -15,17 +15,17 @@
           href="chrome://devtools/content/sourceeditor/codemirror/mozilla.css" />
     <link rel="stylesheet" type="text/css" href="resource://devtools/client/debugger/new/debugger.css" />
   </head>
   <body>
     <div id="mount"></div>
     <script type="application/javascript"
             src="chrome://devtools/content/shared/theme-switching.js"></script>
     <script type="text/javascript">
-      const { BrowserLoader } = Cu.import("resource://devtools/client/shared/browser-loader.js", {});
+      const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
       const { require } = BrowserLoader({
         baseURI: "resource://devtools/client/debugger/new/",
         window,
       });
       Debugger = require("devtools/client/debugger/new/debugger");
     </script>
   </body>
 </html>
diff --git a/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/bootstrap.js b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/bootstrap.js
--- a/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/bootstrap.js
+++ b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/bootstrap.js
@@ -1,19 +1,19 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 function startup(aParams, aReason) {
-  Cu.import("resource://gre/modules/Services.jsm");
+  ChromeUtils.import("resource://gre/modules/Services.jsm");
   let res = Services.io.getProtocolHandler("resource")
                        .QueryInterface(Ci.nsIResProtocolHandler);
   res.setSubstitution("browser_dbg_addon5", aParams.resourceURI);
 
   // Load a JS module
-  Cu.import("resource://browser_dbg_addon5/test.jsm");
+  ChromeUtils.import("resource://browser_dbg_addon5/test.jsm");
 }
 
 function shutdown(aParams, aReason) {
   // Unload the JS module
   Cu.unload("resource://browser_dbg_addon5/test.jsm");
 
   let res = Services.io.getProtocolHandler("resource")
                        .QueryInterface(Ci.nsIResProtocolHandler);
diff --git a/devtools/client/shared/redux/middleware/test/head.js b/devtools/client/shared/redux/middleware/test/head.js
--- a/devtools/client/shared/redux/middleware/test/head.js
+++ b/devtools/client/shared/redux/middleware/test/head.js
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* exported waitUntilState */
 
 "use strict";
 
-const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const flags = require("devtools/shared/flags");
 
 flags.testing = true;
 
 function waitUntilState(store, predicate) {
   return new Promise(resolve => {
     let unsubscribe = store.subscribe(check);
     function check() {
diff --git a/devtools/client/shared/test/unit/test_VariablesView_getString_promise.js b/devtools/client/shared/test/unit/test_VariablesView_getString_promise.js
--- a/devtools/client/shared/test/unit/test_VariablesView_getString_promise.js
+++ b/devtools/client/shared/test/unit/test_VariablesView_getString_promise.js
@@ -1,16 +1,16 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
-const { VariablesView } = Cu.import("resource://devtools/client/shared/widgets/VariablesView.jsm", {});
+const { VariablesView } = ChromeUtils.import("resource://devtools/client/shared/widgets/VariablesView.jsm", {});
 
 const PENDING = {
   "type": "object",
   "class": "Promise",
   "actor": "conn0.pausedobj35",
   "extensible": true,
   "frozen": false,
   "sealed": false,
diff --git a/devtools/client/shared/test/unit/test_attribute-parsing-01.js b/devtools/client/shared/test/unit/test_attribute-parsing-01.js
--- a/devtools/client/shared/test/unit/test_attribute-parsing-01.js
+++ b/devtools/client/shared/test/unit/test_attribute-parsing-01.js
@@ -1,16 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 // Test splitBy from node-attribute-parser.js
 
-const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const {splitBy} = require("devtools/client/shared/node-attribute-parser");
 
 const TEST_DATA = [{
   value: "this is a test",
   splitChar: " ",
   expected: [
     {value: "this"},
     {value: " ", type: "string"},
diff --git a/devtools/client/shared/test/unit/test_attribute-parsing-02.js b/devtools/client/shared/test/unit/test_attribute-parsing-02.js
--- a/devtools/client/shared/test/unit/test_attribute-parsing-02.js
+++ b/devtools/client/shared/test/unit/test_attribute-parsing-02.js
@@ -1,16 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 // Test parseAttribute from node-attribute-parser.js
 
-const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const {parseAttribute} = require("devtools/client/shared/node-attribute-parser");
 
 const TEST_DATA = [{
   tagName: "body",
   namespaceURI: "http://www.w3.org/1999/xhtml",
   attributeName: "class",
   attributeValue: "some css class names",
   expected: [
diff --git a/devtools/client/shared/test/unit/test_cssColor-02.js b/devtools/client/shared/test/unit/test_cssColor-02.js
--- a/devtools/client/shared/test/unit/test_cssColor-02.js
+++ b/devtools/client/shared/test/unit/test_cssColor-02.js
@@ -4,17 +4,17 @@
 
 /**
  * Test color cycling regression - Bug 1303748.
  *
  * Values should cycle from a starting value, back to their original values. This can
  * potentially be a little flaky due to the precision of different color representations.
  */
 
-const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const {colorUtils} = require("devtools/shared/css/color");
 const getFixtureColorData = require("resource://test/helper_color_data.js");
 
 function run_test() {
   getFixtureColorData().forEach(({authored, name, hex, hsl, rgb, cycle}) => {
     if (cycle) {
       const nameCycled = runCycle(name, cycle);
       const hexCycled = runCycle(hex, cycle);
diff --git a/devtools/client/shared/test/unit/test_parseDeclarations.js b/devtools/client/shared/test/unit/test_parseDeclarations.js
--- a/devtools/client/shared/test/unit/test_parseDeclarations.js
+++ b/devtools/client/shared/test/unit/test_parseDeclarations.js
@@ -1,16 +1,16 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
-const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const {
   parseDeclarations,
   _parseCommentDeclarations,
   parseNamedDeclarations
 } = require("devtools/shared/css/parsing-utils");
 const {isCssPropertyKnown} = require("devtools/server/actors/css-properties");
 
 const TEST_DATA = [
diff --git a/devtools/client/shared/test/unit/test_source-utils.js b/devtools/client/shared/test/unit/test_source-utils.js
--- a/devtools/client/shared/test/unit/test_source-utils.js
+++ b/devtools/client/shared/test/unit/test_source-utils.js
@@ -2,17 +2,17 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 /**
  * Tests utility functions contained in `source-utils.js`
  */
 
-const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const sourceUtils = require("devtools/client/shared/source-utils");
 
 const CHROME_URLS = [
   "chrome://foo", "resource://baz", "jar:file:///Users/root"
 ];
 
 const CONTENT_URLS = [
   "http://mozilla.org", "https://mozilla.org", "file:///Users/root", "app://fxosapp",
diff --git a/devtools/client/shared/test/unit/test_suggestion-picker.js b/devtools/client/shared/test/unit/test_suggestion-picker.js
--- a/devtools/client/shared/test/unit/test_suggestion-picker.js
+++ b/devtools/client/shared/test/unit/test_suggestion-picker.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 /**
  * Test the suggestion-picker helper methods.
  */
-const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
+const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const {
   findMostRelevantIndex,
   findMostRelevantCssPropertyIndex
 } = require("devtools/client/shared/suggestion-picker");
 
 /**
  * Run all tests defined below.
  */
diff --git a/devtools/client/shared/test/unit/test_undoStack.js b/devtools/client/shared/test/unit/test_undoStack.js
--- a/devtools/client/shared/test/unit/test_undoStack.js
+++ b/devtools/client/shared/test/unit/test_undoStack.js
@@ -1,17 +1,17 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 const {Loader, Require} =
-  Cu.import("resource://devtools/shared/base-loader.js", {});
+  ChromeUtils.import("resource://devtools/shared/base-loader.js", {});
 
 
 const loader = new Loader({
   paths: {
     "devtools": "resource://devtools",
   },
   globals: {},
 });
diff --git a/devtools/client/styleeditor/test/browser_styleeditor_filesave.js b/devtools/client/styleeditor/test/browser_styleeditor_filesave.js
--- a/devtools/client/styleeditor/test/browser_styleeditor_filesave.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_filesave.js
@@ -4,18 +4,18 @@
 "use strict";
 
 // Test that 'Save' function works.
 
 const TESTCASE_URI_HTML = TEST_BASE_HTTP + "simple.html";
 const TESTCASE_URI_CSS = TEST_BASE_HTTP + "simple.css";
 
 var tempScope = {};
-Cu.import("resource://gre/modules/FileUtils.jsm", tempScope);
-Cu.import("resource://gre/modules/NetUtil.jsm", tempScope);
+ChromeUtils.import("resource://gre/modules/FileUtils.jsm", tempScope);
+ChromeUtils.import("resource://gre/modules/NetUtil.jsm", tempScope);
 var FileUtils = tempScope.FileUtils;
 var NetUtil = tempScope.NetUtil;
 
 add_task(function* () {
   let htmlFile = yield copy(TESTCASE_URI_HTML, "simple.html");
   yield copy(TESTCASE_URI_CSS, "simple.css");
   let uri = Services.io.newFileURI(htmlFile);
   let filePath = uri.resolve("");
diff --git a/devtools/client/styleeditor/test/browser_styleeditor_import.js b/devtools/client/styleeditor/test/browser_styleeditor_import.js
--- a/devtools/client/styleeditor/test/browser_styleeditor_import.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_import.js
@@ -4,17 +4,17 @@
 "use strict";
 
 // Test that the import button in the UI works.
 
 // http rather than chrome to improve coverage
 const TESTCASE_URI = TEST_BASE_HTTP + "simple.html";
 
 var tempScope = {};
-Cu.import("resource://gre/modules/FileUtils.jsm", tempScope);
+ChromeUtils.import("resource://gre/modules/FileUtils.jsm", tempScope);
 var FileUtils = tempScope.FileUtils;
 
 const FILENAME = "styleeditor-import-test.css";
 const SOURCE = "body{background:red;}";
 
 add_task(function* () {
   let { panel, ui } = yield openStyleEditorForURL(TESTCASE_URI);
 
diff --git a/devtools/client/styleeditor/test/browser_styleeditor_sourcemap_watching.js b/devtools/client/styleeditor/test/browser_styleeditor_sourcemap_watching.js
--- a/devtools/client/styleeditor/test/browser_styleeditor_sourcemap_watching.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_sourcemap_watching.js
@@ -11,18 +11,18 @@ const TESTCASE_URI_REG_CSS = TEST_BASE_H
 const TESTCASE_URI_SCSS = TEST_BASE_HTTP + "sourcemap-sass/sourcemaps.scss";
 const TESTCASE_URI_MAP = TEST_BASE_HTTP + "sourcemap-css/sourcemaps.css.map";
 const TESTCASE_SCSS_NAME = "sourcemaps.scss";
 
 const TRANSITIONS_PREF = "devtools.styleeditor.transitions";
 
 const CSS_TEXT = "* { color: blue }";
 
-const {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm", {});
-const {NetUtil} = Cu.import("resource://gre/modules/NetUtil.jsm", {});
+const {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm", {});
+const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm", {});
 
 add_task(function* () {
   yield new Promise(resolve => {
     SpecialPowers.pushPrefEnv({"set": [
       [TRANSITIONS_PREF, false]
     ]}, resolve);
   });
 
diff --git a/devtools/client/webconsole/new-console-output/test/chrome/test_render_perf.html b/devtools/client/webconsole/new-console-output/test/chrome/test_render_perf.html
--- a/devtools/client/webconsole/new-console-output/test/chrome/test_render_perf.html
+++ b/devtools/client/webconsole/new-console-output/test/chrome/test_render_perf.html
@@ -16,17 +16,17 @@
 "use strict";
 
 // To analyze the profile results:
 // > ./mach mochitest test_render_perf.html
 // Then open https://perf-html.io and drag the json file printed at the end of this test
 
 const NUM_MESSAGES = 4000;
 const NUM_STREAMING = 100;
-Cu.import("resource://gre/modules/FileUtils.jsm");
+ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
 const Services = browserRequire("Services");
 Services.prefs.setIntPref("devtools.hud.loglimit", NUM_MESSAGES);
 const NewConsoleOutputWrapper = browserRequire(
   "devtools/client/webconsole/new-console-output/new-console-output-wrapper");
 const actions =
   browserRequire("devtools/client/webconsole/new-console-output/actions/index");
 const EventEmitter = browserRequire("devtools/shared/old-event-emitter");
 const testPackets = Array.from({length: NUM_MESSAGES}).map((el, id) => ({
diff --git a/devtools/server/tests/mochitest/test_Debugger.Script.prototype.global.html b/devtools/server/tests/mochitest/test_Debugger.Script.prototype.global.html
--- a/devtools/server/tests/mochitest/test_Debugger.Script.prototype.global.html
+++ b/devtools/server/tests/mochitest/test_Debugger.Script.prototype.global.html
@@ -11,17 +11,17 @@ Debugger.Script.prototype.global should 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
 <script>
 "use strict";
 
-Cu.import("resource://gre/modules/jsdebugger.jsm");
+ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
 addDebuggerToGlobal(this);
 
 window.onload = function () {
   SimpleTest.waitForExplicitFinish();
 
   let iframe = document.createElement("iframe");
   iframe.src = "data:text/html,<script>function glorp() { }<\/script>";
   iframe.onload = firstOnLoadHandler;
diff --git a/devtools/server/tests/mochitest/test_Debugger.Source.prototype.element.html b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.element.html
--- a/devtools/server/tests/mochitest/test_Debugger.Source.prototype.element.html
+++ b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.element.html
@@ -12,17 +12,17 @@ element to which code is attached (if an
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
 <script>
 "use strict";
 
-Cu.import("resource://gre/modules/jsdebugger.jsm");
+ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
 addDebuggerToGlobal(this);
 
 window.onload = function () {
   SimpleTest.waitForExplicitFinish();
 
   let log = "";
   let doc, dieter, ulrich, isolde, albrecht;
   let dbg, iframeDO, DOFor;
diff --git a/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionScript.html b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionScript.html
--- a/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionScript.html
+++ b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionScript.html
@@ -12,17 +12,17 @@ behave when 'eval' is called with no scr
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
 <script>
 "use strict";
 
-Cu.import("resource://gre/modules/jsdebugger.jsm");
+ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
 addDebuggerToGlobal(this);
 
 window.onload = function () {
   SimpleTest.waitForExplicitFinish();
 
   let dbg, iframeDO, doc, script2DO;
 
   // Create an iframe to debug.
diff --git a/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html
--- a/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html
+++ b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html
@@ -13,17 +13,17 @@ JavaScrip appearing in an inline event h
   <script type="application/javascript" src="inspector-helpers.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
 <script>
 "use strict";
 
-Cu.import("resource://gre/modules/jsdebugger.jsm");
+ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
 addDebuggerToGlobal(this);
 
 let dbg;
 let iframeDO, doc;
 let Tootles, TootlesDO;
 
 window.onload = function () {
   SimpleTest.waitForExplicitFinish();
diff --git a/devtools/server/tests/mochitest/test_executeInGlobal-outerized_this.html b/devtools/server/tests/mochitest/test_executeInGlobal-outerized_this.html
--- a/devtools/server/tests/mochitest/test_executeInGlobal-outerized_this.html
+++ b/devtools/server/tests/mochitest/test_executeInGlobal-outerized_this.html
@@ -13,17 +13,17 @@ object.
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
 <script>
 "use strict";
 
-Cu.import("resource://gre/modules/jsdebugger.jsm");
+ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
 addDebuggerToGlobal(this);
 
 window.onload = function () {
   SimpleTest.waitForExplicitFinish();
 
   let iframe = document.createElement("iframe");
   iframe.src = "data:text/html,<script>var me = 'page 1';<\/script>";
   iframe.onload = firstOnLoadHandler;
diff --git a/devtools/server/tests/mochitest/test_getProcess.html b/devtools/server/tests/mochitest/test_getProcess.html
--- a/devtools/server/tests/mochitest/test_getProcess.html
+++ b/devtools/server/tests/mochitest/test_getProcess.html
@@ -107,17 +107,17 @@ function runTests() {
       let actor = response.form;
       is(actor, firstActor,
          "Second call to getProcess with the same id returns the same form");
       closeClient();
     });
   }
 
   function processScript() {
-    Cu.import("resource://gre/modules/Services.jsm");
+    ChromeUtils.import("resource://gre/modules/Services.jsm");
     let listener = function () {
       Services.obs.removeObserver(listener, "sdk:loader:destroy");
       sendAsyncMessage("test:getProcess-destroy", null);
     };
     Services.obs.addObserver(listener, "sdk:loader:destroy");
   }
 
   function closeClient() {
diff --git a/devtools/server/tests/mochitest/test_makeGlobalObjectReference.html b/devtools/server/tests/mochitest/test_makeGlobalObjectReference.html
--- a/devtools/server/tests/mochitest/test_makeGlobalObjectReference.html
+++ b/devtools/server/tests/mochitest/test_makeGlobalObjectReference.html
@@ -12,17 +12,17 @@ Debugger.prototype.makeGlobalObjectRefer
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
 <script>
 "use strict";
 
-Cu.import("resource://gre/modules/jsdebugger.jsm");
+ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
 addDebuggerToGlobal(this);
 
 window.onload = function () {
   SimpleTest.waitForExplicitFinish();
 
   let iframe = document.createElement("iframe");
   iframe.src = "iframe1_makeGlobalObjectReference.html";
   iframe.onload = iframeOnLoad;
diff --git a/devtools/server/tests/mochitest/test_unsafeDereference.html b/devtools/server/tests/mochitest/test_unsafeDereference.html
--- a/devtools/server/tests/mochitest/test_unsafeDereference.html
+++ b/devtools/server/tests/mochitest/test_unsafeDereference.html
@@ -13,17 +13,17 @@ xray wrapper.
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
 <script>
 "use strict";
 
-Cu.import("resource://gre/modules/jsdebugger.jsm");
+ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
 addDebuggerToGlobal(this);
 
 window.onload = function () {
   SimpleTest.waitForExplicitFinish();
 
   let iframe = document.createElement("iframe");
   iframe.src = "http://mochi.test:8888/chrome/devtools/server/tests/mochitest/nonchrome_unsafeDereference.html";
 
diff --git a/devtools/server/tests/unit/test_addon_reload.js b/devtools/server/tests/unit/test_addon_reload.js
--- a/devtools/server/tests/unit/test_addon_reload.js
+++ b/devtools/server/tests/unit/test_addon_reload.js
@@ -17,17 +17,17 @@ function promiseAddonEvent(event) {
       }
     };
 
     AddonManager.addAddonListener(listener);
   });
 }
 
 function promiseWebExtensionStartup() {
-  const {Management} = Cu.import("resource://gre/modules/Extension.jsm", {});
+  const {Management} = ChromeUtils.import("resource://gre/modules/Extension.jsm", {});
 
   return new Promise(resolve => {
     let listener = (evt, extension) => {
       Management.off("ready", listener);
       resolve(extension);
     };
 
     Management.on("ready", listener);
diff --git a/devtools/server/tests/unit/test_getyoungestframe.js b/devtools/server/tests/unit/test_getyoungestframe.js
--- a/devtools/server/tests/unit/test_getyoungestframe.js
+++ b/devtools/server/tests/unit/test_getyoungestframe.js
@@ -1,11 +1,11 @@
 /* eslint-disable strict */
 function run_test() {
-  Cu.import("resource://gre/modules/jsdebugger.jsm");
+  ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
   addDebuggerToGlobal(this);
   let xpcInspector = Cc["@mozilla.org/jsinspector;1"].getService(Ci.nsIJSInspector);
   let g = testGlobal("test1");
 
   let dbg = new Debugger();
   dbg.uncaughtExceptionHook = testExceptionHook;
 
   dbg.addDebuggee(g);
diff --git a/devtools/server/tests/unit/test_nativewrappers.js b/devtools/server/tests/unit/test_nativewrappers.js
--- a/devtools/server/tests/unit/test_nativewrappers.js
+++ b/devtools/server/tests/unit/test_nativewrappers.js
@@ -1,11 +1,11 @@
 /* eslint-disable strict */
 function run_test() {
-  Cu.import("resource://gre/modules/jsdebugger.jsm");
+  ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
   addDebuggerToGlobal(this);
   let g = testGlobal("test1");
 
   let dbg = new Debugger();
   dbg.addDebuggee(g);
   dbg.onDebuggerStatement = function (frame) {
     let args = frame.arguments;
     try {
diff --git a/devtools/server/tests/unit/test_safe-getter.js b/devtools/server/tests/unit/test_safe-getter.js
--- a/devtools/server/tests/unit/test_safe-getter.js
+++ b/devtools/server/tests/unit/test_safe-getter.js
@@ -1,11 +1,11 @@
 /* eslint-disable strict */
 function run_test() {
-  Cu.import("resource://gre/modules/jsdebugger.jsm");
+  ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
   addDebuggerToGlobal(this);
   let g = testGlobal("test");
   let dbg = new Debugger();
   let gw = dbg.addDebuggee(g);
 
   g.eval(`
     // This is not a CCW.
     Object.defineProperty(this, "bar", {
diff --git a/devtools/server/tests/unit/test_unsafeDereference.js b/devtools/server/tests/unit/test_unsafeDereference.js
--- a/devtools/server/tests/unit/test_unsafeDereference.js
+++ b/devtools/server/tests/unit/test_unsafeDereference.js
@@ -6,17 +6,17 @@
 // Test Debugger.Object.prototype.unsafeDereference in the presence of
 // interesting cross-compartment wrappers.
 //
 // This is not really a debugger server test; it's more of a Debugger test.
 // But we need xpcshell and Components.utils.Sandbox to get
 // cross-compartment wrappers with interesting properties, and this is the
 // xpcshell test directory most closely related to the JS Debugger API.
 
-Cu.import("resource://gre/modules/jsdebugger.jsm");
+ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
 addDebuggerToGlobal(this);
 
 // Add a method to Debugger.Object for fetching value properties
 // conveniently.
 Debugger.Object.prototype.getProperty = function (name) {
   let desc = this.getOwnPropertyDescriptor(name);
   if (!desc) {
     return undefined;
diff --git a/devtools/shared/apps/Devices.jsm b/devtools/shared/apps/Devices.jsm
--- a/devtools/shared/apps/Devices.jsm
+++ b/devtools/shared/apps/Devices.jsm
@@ -1,15 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 "use strict";
 
-const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const EventEmitter = require("devtools/shared/old-event-emitter");
 
 
 /* exported EXPORTED_SYMBOLS */
 
 const EXPORTED_SYMBOLS = ["Devices"];
 
 var addonInstalled = false;
diff --git a/devtools/shared/css/generated/generate-properties-db.js b/devtools/shared/css/generated/generate-properties-db.js
--- a/devtools/shared/css/generated/generate-properties-db.js
+++ b/devtools/shared/css/generated/generate-properties-db.js
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
 /*
  * This is an xpcshell script that runs to generate a static list of CSS properties
  * as known by the platform. It is run from ./mach_commands.py by running
  * `mach devtools-css-db`.
  */
-var {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
+var {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 var {generateCssProperties} = require("devtools/server/actors/css-properties");
 
 // xpcshell can output extra information, so place some delimiter text between
 // the output of the css properties database.
 dump("DEVTOOLS_CSS_DB_DELIMITER");
 
 // Output JSON
 dump(JSON.stringify({
diff --git a/devtools/shared/security/tests/chrome/test_websocket-transport.html b/devtools/shared/security/tests/chrome/test_websocket-transport.html
--- a/devtools/shared/security/tests/chrome/test_websocket-transport.html
+++ b/devtools/shared/security/tests/chrome/test_websocket-transport.html
@@ -7,17 +7,17 @@
   <script src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <script>
 "use strict";
 
 window.onload = function () {
-  const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
+  const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
   const Services = require("Services");
   const {DebuggerClient} = require("devtools/shared/client/debugger-client");
   const {DebuggerServer} = require("devtools/server/main");
 
   Services.prefs.setBoolPref("devtools.debugger.remote-enabled", true);
   Services.prefs.setBoolPref("devtools.debugger.prompt-connection", false);
 
   SimpleTest.registerCleanupFunction(() => {
diff --git a/devtools/shared/webconsole/test/unit/test_js_property_provider.js b/devtools/shared/webconsole/test/unit/test_js_property_provider.js
--- a/devtools/shared/webconsole/test/unit/test_js_property_provider.js
+++ b/devtools/shared/webconsole/test/unit/test_js_property_provider.js
@@ -1,18 +1,18 @@
 /* -*- js-indent-level: 2; indent-tabs-mode: nil -*- */
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/publicdomain/zero/1.0/
 
 "use strict";
-const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const { FallibleJSPropertyProvider: JSPropertyProvider } =
   require("devtools/shared/webconsole/js-property-provider");
 
-Cu.import("resource://gre/modules/jsdebugger.jsm");
+ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
 addDebuggerToGlobal(this);
 
 function run_test() {
   const testArray = `var testArray = [
     {propA: "A"},
     {
       propB: "B",
       propC: [
diff --git a/devtools/shared/webconsole/test/unit/test_security-info-certificate.js b/devtools/shared/webconsole/test/unit/test_security-info-certificate.js
--- a/devtools/shared/webconsole/test/unit/test_security-info-certificate.js
+++ b/devtools/shared/webconsole/test/unit/test_security-info-certificate.js
@@ -1,17 +1,17 @@
 /* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
 // Tests that NetworkHelper.parseCertificateInfo parses certificate information
 // correctly.
 
-const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 
 Object.defineProperty(this, "NetworkHelper", {
   get: function () {
     return require("devtools/shared/webconsole/network-helper");
   },
   configurable: true,
   writeable: false,
   enumerable: true
diff --git a/devtools/shared/webconsole/test/unit/test_security-info-parser.js b/devtools/shared/webconsole/test/unit/test_security-info-parser.js
--- a/devtools/shared/webconsole/test/unit/test_security-info-parser.js
+++ b/devtools/shared/webconsole/test/unit/test_security-info-parser.js
@@ -1,17 +1,17 @@
 /* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
 // Test that NetworkHelper.parseSecurityInfo returns correctly formatted object.
 
-const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+onst { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 Object.defineProperty(this, "NetworkHelper", {
   get: function () {
     return require("devtools/shared/webconsole/network-helper");
   },
   configurable: true,
   writeable: false,
   enumerable: true
diff --git a/devtools/shared/webconsole/test/unit/test_security-info-protocol-version.js b/devtools/shared/webconsole/test/unit/test_security-info-protocol-version.js
--- a/devtools/shared/webconsole/test/unit/test_security-info-protocol-version.js
+++ b/devtools/shared/webconsole/test/unit/test_security-info-protocol-version.js
@@ -1,17 +1,17 @@
 /* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
 // Tests that NetworkHelper.formatSecurityProtocol returns correct
 // protocol version strings.
 
-const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 
 Object.defineProperty(this, "NetworkHelper", {
   get: function () {
     return require("devtools/shared/webconsole/network-helper");
   },
   configurable: true,
   writeable: false,
   enumerable: true
diff --git a/devtools/shared/webconsole/test/unit/test_security-info-state.js b/devtools/shared/webconsole/test/unit/test_security-info-state.js
--- a/devtools/shared/webconsole/test/unit/test_security-info-state.js
+++ b/devtools/shared/webconsole/test/unit/test_security-info-state.js
@@ -1,18 +1,18 @@
 /* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
 // Tests that security info parser gives correct general security state for
 // different cases.
 
-const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 Object.defineProperty(this, "NetworkHelper", {
   get: function () {
     return require("devtools/shared/webconsole/network-helper");
   },
   configurable: true,
   writeable: false,
   enumerable: true
diff --git a/devtools/shared/webconsole/test/unit/test_security-info-static-hpkp.js b/devtools/shared/webconsole/test/unit/test_security-info-static-hpkp.js
--- a/devtools/shared/webconsole/test/unit/test_security-info-static-hpkp.js
+++ b/devtools/shared/webconsole/test/unit/test_security-info-static-hpkp.js
@@ -1,17 +1,17 @@
 /* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
 // Test that NetworkHelper.parseSecurityInfo correctly detects static hpkp pins
 
-const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 const Services = require("Services");
 
 Object.defineProperty(this, "NetworkHelper", {
   get: function () {
     return require("devtools/shared/webconsole/network-helper");
   },
   configurable: true,
   writeable: false,
diff --git a/devtools/shared/webconsole/test/unit/test_security-info-weakness-reasons.js b/devtools/shared/webconsole/test/unit/test_security-info-weakness-reasons.js
--- a/devtools/shared/webconsole/test/unit/test_security-info-weakness-reasons.js
+++ b/devtools/shared/webconsole/test/unit/test_security-info-weakness-reasons.js
@@ -1,17 +1,17 @@
 /* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
 // Tests that NetworkHelper.getReasonsForWeakness returns correct reasons for
 // weak requests.
 
-const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 
 Object.defineProperty(this, "NetworkHelper", {
   get: function () {
     return require("devtools/shared/webconsole/network-helper");
   },
   configurable: true,
   writeable: false,
   enumerable: true
diff --git a/dom/media/tests/mochitest/identity/test_fingerprints.html b/dom/media/tests/mochitest/identity/test_fingerprints.html
--- a/dom/media/tests/mochitest/identity/test_fingerprints.html
+++ b/dom/media/tests/mochitest/identity/test_fingerprints.html
@@ -6,17 +6,17 @@
 </head>
 <body>
   <script class="testbody" type="application/javascript">
 'use strict';
 
 // here we call the identity provider directly
 function getIdentityAssertion(fpArray) {
   var Cu = SpecialPowers.Cu;
-  var rtcid = Cu.import('resource://gre/modules/media/IdpSandbox.jsm');
+  var rtcid = ChromeUtils.import('resource://gre/modules/media/IdpSandbox.jsm');
   var sandbox = new rtcid.IdpSandbox('example.com', 'idp.js', window);
   return sandbox.start()
     .then(idp => SpecialPowers.wrap(idp)
                    .generateAssertion(JSON.stringify({ fingerprint: fpArray }),
                                       'https://example.com'))
     .then(assertion => {
       assertion = SpecialPowers.wrap(assertion);
       var assertionString = btoa(JSON.stringify(assertion));
diff --git a/dom/media/tests/mochitest/identity/test_idpproxy.html b/dom/media/tests/mochitest/identity/test_idpproxy.html
--- a/dom/media/tests/mochitest/identity/test_idpproxy.html
+++ b/dom/media/tests/mochitest/identity/test_idpproxy.html
@@ -3,17 +3,17 @@
 <meta charset="utf-8" />
 <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
 </head>
 <body>
   <script class="testbody" type="application/javascript">
 "use strict";
 var Cu = SpecialPowers.Cu;
-var rtcid = Cu.import("resource://gre/modules/media/IdpSandbox.jsm");
+var rtcid = ChromeUtils.import("resource://gre/modules/media/IdpSandbox.jsm");
 var IdpSandbox = rtcid.IdpSandbox;
 var dummyPayload = JSON.stringify({
   this: 'is',
   a: ['stu', 6],
   obj: null
 });
 
 function test_domain_sandbox() {
diff --git a/intl/l10n/L10nRegistry.jsm b/intl/l10n/L10nRegistry.jsm
--- a/intl/l10n/L10nRegistry.jsm
+++ b/intl/l10n/L10nRegistry.jsm
@@ -1,10 +1,10 @@
-const { Services } = Components.utils.import('resource://gre/modules/Services.jsm', {});
-const { MessageContext } = Components.utils.import("resource://gre/modules/MessageContext.jsm", {});
+const { Services } = ChromeUtils.import('resource://gre/modules/Services.jsm', {});
+const { MessageContext } = ChromeUtils.import("resource://gre/modules/MessageContext.jsm", {});
 Components.utils.importGlobalProperties(["fetch"]); /* globals fetch */
 
 /**
  * L10nRegistry is a localization resource management system for Gecko.
  *
  * It manages the list of resource sources provided with the app and allows
  * for additional sources to be added and updated.
  *
diff --git a/intl/l10n/Localization.jsm b/intl/l10n/Localization.jsm
--- a/intl/l10n/Localization.jsm
+++ b/intl/l10n/Localization.jsm
@@ -19,17 +19,17 @@
 
 /* eslint no-console: ["error", { allow: ["warn", "error"] }] */
 /* global console */
 
 const Cu = Components.utils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
-const { L10nRegistry } = Cu.import("resource://gre/modules/L10nRegistry.jsm", {});
+const { L10nRegistry } = ChromeUtils.import("resource://gre/modules/L10nRegistry.jsm", {});
 const LocaleService = Cc["@mozilla.org/intl/localeservice;1"].getService(Ci.mozILocaleService);
 const ObserverService = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
 
 /**
  * CachedIterable caches the elements yielded by an iterable.
  *
  * It can be used to iterate over an iterable many times without depleting the
  * iterable.
@@ -400,17 +400,17 @@ function keysFromContext(method, ctx, ke
     if (messageErrors.length === 0 ||
         !messageErrors.some(e => e instanceof L10nError)) {
       translations[i] = translation;
     } else {
       hasErrors = true;
     }
 
     if (messageErrors.length) {
-      const { console } = Cu.import("resource://gre/modules/Console.jsm", {});
+      const { console } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
       messageErrors.forEach(error => console.warn(error));
     }
   });
 
   return hasErrors;
 }
 
 this.Localization = Localization;
diff --git a/intl/l10n/l10n.js b/intl/l10n/l10n.js
--- a/intl/l10n/l10n.js
+++ b/intl/l10n/l10n.js
@@ -1,11 +1,11 @@
 {
   const { DOMLocalization } =
-    Components.utils.import("resource://gre/modules/DOMLocalization.jsm");
+    ChromeUtils.import("resource://gre/modules/DOMLocalization.jsm");
 
   /**
    * Polyfill for document.ready polyfill.
    * See: https://github.com/whatwg/html/issues/127 for details.
    *
    * @returns {Promise}
    */
   function documentReady() {
diff --git a/intl/l10n/test/dom/test_domloc.xul b/intl/l10n/test/dom/test_domloc.xul
--- a/intl/l10n/test/dom/test_domloc.xul
+++ b/intl/l10n/test/dom/test_domloc.xul
@@ -7,19 +7,19 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="Testing DOMLocalization in XUL environment">
 
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
   <script type="application/javascript">
   <![CDATA[
   const { DOMLocalization } =
-    Components.utils.import("resource://gre/modules/DOMLocalization.jsm", {});
+    ChromeUtils.import("resource://gre/modules/DOMLocalization.jsm", {});
   const { MessageContext } =
-    Components.utils.import("resource://gre/modules/MessageContext.jsm", {});
+    ChromeUtils.import("resource://gre/modules/MessageContext.jsm", {});
 
   async function * generateMessages(locales, resourceIds) {
     const mc = new MessageContext(locales);
     mc.addMessages(`
 file-menu
     .label = File
     .accesskey = F
 new-tab
diff --git a/intl/l10n/test/dom/test_domloc_connectRoot.html b/intl/l10n/test/dom/test_domloc_connectRoot.html
--- a/intl/l10n/test/dom/test_domloc_connectRoot.html
+++ b/intl/l10n/test/dom/test_domloc_connectRoot.html
@@ -3,17 +3,17 @@
 <head>
   <meta charset="utf-8">
   <title>Test DOMLocalization.prototype.connectRoot</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
   const { DOMLocalization } =
-    Components.utils.import("resource://gre/modules/DOMLocalization.jsm", {});
+    ChromeUtils.import("resource://gre/modules/DOMLocalization.jsm", {});
 
   async function * mockGenerateMessages(locales, resourceIds) {
   }
 
   window.onload = async function () {
     SimpleTest.waitForExplicitFinish();
 
     const domLoc = new DOMLocalization(
diff --git a/intl/l10n/test/dom/test_domloc_disconnectRoot.html b/intl/l10n/test/dom/test_domloc_disconnectRoot.html
--- a/intl/l10n/test/dom/test_domloc_disconnectRoot.html
+++ b/intl/l10n/test/dom/test_domloc_disconnectRoot.html
@@ -3,17 +3,17 @@
 <head>
   <meta charset="utf-8">
   <title>Test DOMLocalization.prototype.disconnectRoot</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
   const { DOMLocalization } =
-    Components.utils.import("resource://gre/modules/DOMLocalization.jsm", {});
+    ChromeUtils.import("resource://gre/modules/DOMLocalization.jsm", {});
 
   async function * mockGenerateMessages(locales, resourceIds) {
   }
 
   window.onload = async function () {
     SimpleTest.waitForExplicitFinish();
 
     const domLoc = new DOMLocalization(
diff --git a/intl/l10n/test/dom/test_domloc_getAttributes.html b/intl/l10n/test/dom/test_domloc_getAttributes.html
--- a/intl/l10n/test/dom/test_domloc_getAttributes.html
+++ b/intl/l10n/test/dom/test_domloc_getAttributes.html
@@ -3,17 +3,17 @@
 <head>
   <meta charset="utf-8">
   <title>Test DOMLocalization.prototype.getAttributes</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
   const { DOMLocalization } =
-    Components.utils.import("resource://gre/modules/DOMLocalization.jsm", {});
+    ChromeUtils.import("resource://gre/modules/DOMLocalization.jsm", {});
 
   async function * mockGenerateMessages(locales, resourceIds) {}
 
   window.onload = function () {
     SimpleTest.waitForExplicitFinish();
 
     const domLoc = new DOMLocalization(
       window,
diff --git a/intl/l10n/test/dom/test_domloc_mutations.html b/intl/l10n/test/dom/test_domloc_mutations.html
--- a/intl/l10n/test/dom/test_domloc_mutations.html
+++ b/intl/l10n/test/dom/test_domloc_mutations.html
@@ -3,19 +3,19 @@
 <head>
   <meta charset="utf-8">
   <title>Test DOMLocalization's MutationObserver</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
   const { DOMLocalization } =
-    Components.utils.import("resource://gre/modules/DOMLocalization.jsm", {});
+    ChromeUtils.import("resource://gre/modules/DOMLocalization.jsm", {});
   const { MessageContext } =
-    Components.utils.import("resource://gre/modules/MessageContext.jsm", {});
+    ChromeUtils.import("resource://gre/modules/MessageContext.jsm", {});
 
   async function * mockGenerateMessages(locales, resourceIds) {
     const mc = new MessageContext(locales);
     mc.addMessages('title = Hello World');
     mc.addMessages('title2 = Hello Another World');
     yield mc;
   }
 
diff --git a/intl/l10n/test/dom/test_domloc_overlay.html b/intl/l10n/test/dom/test_domloc_overlay.html
--- a/intl/l10n/test/dom/test_domloc_overlay.html
+++ b/intl/l10n/test/dom/test_domloc_overlay.html
@@ -3,19 +3,19 @@
 <head>
   <meta charset="utf-8">
   <title>Test DOMLocalization's DOMOverlay functionality</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
   const { DOMLocalization } =
-    Components.utils.import("resource://gre/modules/DOMLocalization.jsm", {});
+    ChromeUtils.import("resource://gre/modules/DOMLocalization.jsm", {});
   const { MessageContext } =
-    Components.utils.import("resource://gre/modules/MessageContext.jsm", {});
+    ChromeUtils.import("resource://gre/modules/MessageContext.jsm", {});
 
   async function * mockGenerateMessages(locales, resourceIds) {
     const mc = new MessageContext(locales);
     mc.addMessages('title = <strong>Hello</strong> World');
     mc.addMessages('title2 = This is <a>a link</a>!');
     yield mc;
   }
 
diff --git a/intl/l10n/test/dom/test_domloc_overlay_missing_children.html b/intl/l10n/test/dom/test_domloc_overlay_missing_children.html
--- a/intl/l10n/test/dom/test_domloc_overlay_missing_children.html
+++ b/intl/l10n/test/dom/test_domloc_overlay_missing_children.html
@@ -3,19 +3,19 @@
 <head>
   <meta charset="utf-8">
   <title>Test DOMLocalization's DOMOverlay functionality</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
   const { DOMLocalization } =
-    Components.utils.import("resource://gre/modules/DOMLocalization.jsm", {});
+    ChromeUtils.import("resource://gre/modules/DOMLocalization.jsm", {});
   const { MessageContext } =
-    Components.utils.import("resource://gre/modules/MessageContext.jsm", {});
+    ChromeUtils.import("resource://gre/modules/MessageContext.jsm", {});
 
   async function * mockGenerateMessages(locales, resourceIds) {
     const mc = new MessageContext(locales);
     mc.addMessages('title = Visit <a>Mozilla</a> or <a>Firefox</a> website!');
     yield mc;
   }
 
   window.onload = async function () {
diff --git a/intl/l10n/test/dom/test_domloc_overlay_repeated.html b/intl/l10n/test/dom/test_domloc_overlay_repeated.html
--- a/intl/l10n/test/dom/test_domloc_overlay_repeated.html
+++ b/intl/l10n/test/dom/test_domloc_overlay_repeated.html
@@ -3,19 +3,19 @@
 <head>
   <meta charset="utf-8">
   <title>Test DOMLocalization's DOMOverlay functionality</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
   const { DOMLocalization } =
-    Components.utils.import("resource://gre/modules/DOMLocalization.jsm", {});
+    ChromeUtils.import("resource://gre/modules/DOMLocalization.jsm", {});
   const { MessageContext } =
-    Components.utils.import("resource://gre/modules/MessageContext.jsm", {});
+    ChromeUtils.import("resource://gre/modules/MessageContext.jsm", {});
 
   async function * mockGenerateMessages(locales, resourceIds) {
     const mc = new MessageContext(locales);
     mc.addMessages('title = Visit <a>Mozilla</a> or <a>Firefox</a> website!');
     yield mc;
   }
 
   window.onload = async function () {
diff --git a/intl/l10n/test/dom/test_domloc_setAttributes.html b/intl/l10n/test/dom/test_domloc_setAttributes.html
--- a/intl/l10n/test/dom/test_domloc_setAttributes.html
+++ b/intl/l10n/test/dom/test_domloc_setAttributes.html
@@ -3,17 +3,17 @@
 <head>
   <meta charset="utf-8">
   <title>Test DOMLocalization.prototype.setAttributes</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
   const { DOMLocalization } =
-    Components.utils.import("resource://gre/modules/DOMLocalization.jsm", {});
+    ChromeUtils.import("resource://gre/modules/DOMLocalization.jsm", {});
 
   async function * mockGenerateMessages(locales, resourceIds) {}
 
   window.onload = function () {
     SimpleTest.waitForExplicitFinish();
 
     const domLoc = new DOMLocalization(
       window,
diff --git a/intl/l10n/test/dom/test_domloc_translateElements.html b/intl/l10n/test/dom/test_domloc_translateElements.html
--- a/intl/l10n/test/dom/test_domloc_translateElements.html
+++ b/intl/l10n/test/dom/test_domloc_translateElements.html
@@ -3,19 +3,19 @@
 <head>
   <meta charset="utf-8">
   <title>Test DOMLocalization.prototype.translateElements</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
   const { DOMLocalization } =
-    Components.utils.import("resource://gre/modules/DOMLocalization.jsm", {});
+    ChromeUtils.import("resource://gre/modules/DOMLocalization.jsm", {});
   const { MessageContext } =
-    Components.utils.import("resource://gre/modules/MessageContext.jsm", {});
+    ChromeUtils.import("resource://gre/modules/MessageContext.jsm", {});
 
   async function * mockGenerateMessages(locales, resourceIds) {
     const mc = new MessageContext(locales);
     mc.addMessages('title = Hello World');
     mc.addMessages('link\n    .title = Click me');
     yield mc;
   }
 
diff --git a/intl/l10n/test/dom/test_domloc_translateFragment.html b/intl/l10n/test/dom/test_domloc_translateFragment.html
--- a/intl/l10n/test/dom/test_domloc_translateFragment.html
+++ b/intl/l10n/test/dom/test_domloc_translateFragment.html
@@ -3,19 +3,19 @@
 <head>
   <meta charset="utf-8">
   <title>Test DOMLocalization.prototype.translateFragment</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
   const { DOMLocalization } =
-    Components.utils.import("resource://gre/modules/DOMLocalization.jsm", {});
+    ChromeUtils.import("resource://gre/modules/DOMLocalization.jsm", {});
   const { MessageContext } =
-    Components.utils.import("resource://gre/modules/MessageContext.jsm", {});
+    ChromeUtils.import("resource://gre/modules/MessageContext.jsm", {});
 
   async function * mockGenerateMessages(locales, resourceIds) {
     const mc = new MessageContext(locales);
     mc.addMessages('title = Hello World');
     mc.addMessages('subtitle = Welcome to Fluent');
     yield mc;
   }
 
diff --git a/intl/l10n/test/dom/test_domloc_translateRoots.html b/intl/l10n/test/dom/test_domloc_translateRoots.html
--- a/intl/l10n/test/dom/test_domloc_translateRoots.html
+++ b/intl/l10n/test/dom/test_domloc_translateRoots.html
@@ -3,19 +3,19 @@
 <head>
   <meta charset="utf-8">
   <title>Test DOMLocalization.prototype.translateRoots</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
   const { DOMLocalization } =
-    Components.utils.import("resource://gre/modules/DOMLocalization.jsm", {});
+    ChromeUtils.import("resource://gre/modules/DOMLocalization.jsm", {});
   const { MessageContext } =
-    Components.utils.import("resource://gre/modules/MessageContext.jsm", {});
+    ChromeUtils.import("resource://gre/modules/MessageContext.jsm", {});
 
   async function * mockGenerateMessages(locales, resourceIds) {
     const mc = new MessageContext(locales);
     mc.addMessages('title = Hello World');
     mc.addMessages('title2 = Hello Another World');
     yield mc;
   }
 
diff --git a/intl/l10n/test/test_domlocalization.js b/intl/l10n/test/test_domlocalization.js
--- a/intl/l10n/test/test_domlocalization.js
+++ b/intl/l10n/test/test_domlocalization.js
@@ -1,13 +1,13 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 const { DOMLocalization } =
-  Components.utils.import("resource://gre/modules/DOMLocalization.jsm", {});
+  ChromeUtils.import("resource://gre/modules/DOMLocalization.jsm", {});
 
 add_task(function test_methods_presence() {
   equal(typeof DOMLocalization.prototype.getAttributes, "function");
   equal(typeof DOMLocalization.prototype.setAttributes, "function");
   equal(typeof DOMLocalization.prototype.translateFragment, "function");
   equal(typeof DOMLocalization.prototype.translateElements, "function");
   equal(typeof DOMLocalization.prototype.connectRoot, "function");
   equal(typeof DOMLocalization.prototype.disconnectRoot, "function");
diff --git a/intl/l10n/test/test_l10nregistry.js b/intl/l10n/test/test_l10nregistry.js
--- a/intl/l10n/test/test_l10nregistry.js
+++ b/intl/l10n/test/test_l10nregistry.js
@@ -1,17 +1,17 @@
 /* Any copyrighequal dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 const {
   L10nRegistry,
   FileSource,
   IndexedFileSource
-} = Components.utils.import("resource://gre/modules/L10nRegistry.jsm", {});
-Components.utils.import("resource://gre/modules/Timer.jsm");
+} = ChromeUtils.import("resource://gre/modules/L10nRegistry.jsm", {});
+ChromeUtils.import("resource://gre/modules/Timer.jsm");
 
 let fs;
 L10nRegistry.load = async function(url) {
   if (!fs.hasOwnProperty(url)) {
     return Promise.reject('Resource unavailable');
   }
   return fs[url];
 }
diff --git a/intl/l10n/test/test_localization.js b/intl/l10n/test/test_localization.js
--- a/intl/l10n/test/test_localization.js
+++ b/intl/l10n/test/test_localization.js
@@ -1,22 +1,22 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const { Localization } = Components.utils.import("resource://gre/modules/Localization.jsm", {});
+const { Localization } = ChromeUtils.import("resource://gre/modules/Localization.jsm", {});
 
 add_task(function test_methods_presence() {
   equal(typeof Localization.prototype.formatValues, "function");
   equal(typeof Localization.prototype.formatMessages, "function");
   equal(typeof Localization.prototype.formatValue, "function");
 });
 
 add_task(async function test_methods_calling() {
   const { L10nRegistry, FileSource } =
-    Components.utils.import("resource://gre/modules/L10nRegistry.jsm", {});
+    ChromeUtils.import("resource://gre/modules/L10nRegistry.jsm", {});
   const LocaleService =
     Components.classes["@mozilla.org/intl/localeservice;1"].getService(
       Components.interfaces.mozILocaleService);
 
   const fs = {
     '/localization/de/browser/menu.ftl': 'key = [de] Value2',
     '/localization/en-US/browser/menu.ftl': 'key = [en] Value2\nkey2 = [en] Value3',
   };
diff --git a/intl/l10n/test/test_messagecontext.js b/intl/l10n/test/test_messagecontext.js
--- a/intl/l10n/test/test_messagecontext.js
+++ b/intl/l10n/test/test_messagecontext.js
@@ -1,13 +1,13 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 function run_test() {
-  const { MessageContext } = Components.utils.import("resource://gre/modules/MessageContext.jsm", {});
+  const { MessageContext } = ChromeUtils.import("resource://gre/modules/MessageContext.jsm", {});
 
   test_methods_presence(MessageContext);
   test_methods_calling(MessageContext);
 
   ok(true);
 }
 
 function test_methods_presence(MessageContext) {
diff --git a/js/xpconnect/tests/unit/environment_loadscript.jsm b/js/xpconnect/tests/unit/environment_loadscript.jsm
--- a/js/xpconnect/tests/unit/environment_loadscript.jsm
+++ b/js/xpconnect/tests/unit/environment_loadscript.jsm
@@ -1,9 +1,9 @@
-Components.utils.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var EXPORTED_SYMBOLS = ["target", "bound"];
 
 var bound = "";
 var target = {};
 Services.scriptloader.loadSubScript("resource://test/environment_script.js", target);
 
 // Check global bindings
diff --git a/js/xpconnect/tests/unit/test_ComponentEnvironment.js b/js/xpconnect/tests/unit/test_ComponentEnvironment.js
--- a/js/xpconnect/tests/unit/test_ComponentEnvironment.js
+++ b/js/xpconnect/tests/unit/test_ComponentEnvironment.js
@@ -1,13 +1,13 @@
 const {utils: Cu} = Components;
 
 let tgt = {};
-const a = Components.utils.import("resource://test/environment_script.js", tgt);
-const b = Components.utils.import("resource://test/environment_checkscript.jsm", tgt);
+const a = ChromeUtils.import("resource://test/environment_script.js", tgt);
+const b = ChromeUtils.import("resource://test/environment_checkscript.jsm", tgt);
 
 const isShared = Cu.getGlobalForObject(a) === Cu.getGlobalForObject(b);
 
 
 // Components should not share namespace
 if (isShared) {
   todo_check_eq(tgt.bound, "");
   Assert.equal(tgt.bound, "ei,fo,", "Modules should have no shared non-eval bindings");
diff --git a/js/xpconnect/tests/unit/test_FrameScriptEnvironment.js b/js/xpconnect/tests/unit/test_FrameScriptEnvironment.js
--- a/js/xpconnect/tests/unit/test_FrameScriptEnvironment.js
+++ b/js/xpconnect/tests/unit/test_FrameScriptEnvironment.js
@@ -1,9 +1,9 @@
-Components.utils.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 let ppmm = Services.ppmm.getChildAt(0);
 
 add_task(async function test_bindings() {
     let {strict, bound} = await new Promise(function(resolve) {
         // Use a listener to get results from child
         ppmm.addMessageListener("results", function listener(msg) {
             ppmm.removeMessageListener("results", listener);
diff --git a/js/xpconnect/tests/unit/test_SubscriptLoaderEnvironment.js b/js/xpconnect/tests/unit/test_SubscriptLoaderEnvironment.js
--- a/js/xpconnect/tests/unit/test_SubscriptLoaderEnvironment.js
+++ b/js/xpconnect/tests/unit/test_SubscriptLoaderEnvironment.js
@@ -1,9 +1,9 @@
-Components.utils.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 let tgt = {};
 Services.scriptloader.loadSubScript("resource://test/environment_script.js", tgt);
 
 var bound = "";
 var tgt_bound = "";
 
 // Check global bindings
diff --git a/js/xpconnect/tests/unit/test_SubscriptLoaderJSMEnvironment.js b/js/xpconnect/tests/unit/test_SubscriptLoaderJSMEnvironment.js
--- a/js/xpconnect/tests/unit/test_SubscriptLoaderJSMEnvironment.js
+++ b/js/xpconnect/tests/unit/test_SubscriptLoaderJSMEnvironment.js
@@ -1,14 +1,14 @@
 const {utils: Cu} = Components;
 
 let tgt_load = {};
 let tgt_check = {};
-const a = Components.utils.import("resource://test/environment_loadscript.jsm", tgt_load);
-const b = Components.utils.import("resource://test/environment_checkscript.jsm", tgt_check);
+const a = ChromeUtils.import("resource://test/environment_loadscript.jsm", tgt_load);
+const b = ChromeUtils.import("resource://test/environment_checkscript.jsm", tgt_check);
 
 const isShared = Cu.getGlobalForObject(a) === Cu.getGlobalForObject(b);
 
 // Check target bindings
 var tgt_subscript_bound = "";
 for (var name of ["vu", "vq", "vl", "gt", "ed", "ei", "fo", "fi", "fd"])
     if (tgt_load.target.hasOwnProperty(name))
         tgt_subscript_bound += name + ",";
diff --git a/js/xpconnect/tests/unit/test_SubscriptLoaderSandboxEnvironment.js b/js/xpconnect/tests/unit/test_SubscriptLoaderSandboxEnvironment.js
--- a/js/xpconnect/tests/unit/test_SubscriptLoaderSandboxEnvironment.js
+++ b/js/xpconnect/tests/unit/test_SubscriptLoaderSandboxEnvironment.js
@@ -1,9 +1,9 @@
-Components.utils.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 let tgt = Components.utils.Sandbox(Services.scriptSecurityManager.getSystemPrincipal());
 Services.scriptloader.loadSubScript("resource://test/environment_script.js", tgt);
 
 var bound = "";
 var tgt_bound = "";
 
 // Check global bindings
diff --git a/netwerk/test/mochitests/file_1331680.js b/netwerk/test/mochitests/file_1331680.js
--- a/netwerk/test/mochitests/file_1331680.js
+++ b/netwerk/test/mochitests/file_1331680.js
@@ -1,11 +1,11 @@
 let {utils: Cu, classes: Cc, interfaces: Ci } = Components;
 
-Cu.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 let cs = Cc["@mozilla.org/cookieService;1"].getService(Ci.nsICookieService);
 
 var observer = {
   observe: function(subject, topic, data) {
     if (topic == "cookie-changed") {
       let cookie = subject.QueryInterface(Ci.nsICookie2);
       sendAsyncMessage("cookieName", cookie.name + "=" + cookie.value);
       sendAsyncMessage("cookieOperation", data);
diff --git a/netwerk/test/mochitests/test_1396395.html b/netwerk/test/mochitests/test_1396395.html
--- a/netwerk/test/mochitests/test_1396395.html
+++ b/netwerk/test/mochitests/test_1396395.html
@@ -10,17 +10,17 @@
   <iframe id="f" src="http://example.com"></iframe>
   <script type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 var script = SpecialPowers.loadChromeScript(() => {
   const Ci = Components.interfaces;
   const Cc = Components.classes;
   const Cu = Components.utils;
-  Cu.import('resource://gre/modules/Services.jsm');
+  ChromeUtils.import('resource://gre/modules/Services.jsm');
 
   Services.obs.addObserver(function onExamResp(subject, topic, data) {
     let channel = subject.QueryInterface(Ci.nsIHttpChannel);
     if (!channel.URI.spec.startsWith("http://example.org")) {
       return;
     }
     Services.obs.removeObserver(onExamResp, 'http-on-examine-response');
     channel.suspend();
diff --git a/netwerk/test/unit/test_backgroundfilesaver.js b/netwerk/test/unit/test_backgroundfilesaver.js
--- a/netwerk/test/unit/test_backgroundfilesaver.js
+++ b/netwerk/test/unit/test_backgroundfilesaver.js
@@ -5,26 +5,26 @@
 
 /**
  * This file tests components that implement nsIBackgroundFileSaver.
  */
 
 ////////////////////////////////////////////////////////////////////////////////
 //// Globals
 
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
-                                  "resource://gre/modules/FileUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
-                                  "resource://gre/modules/NetUtil.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "Services",
-                                  "resource://gre/modules/Services.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "FileTestUtils",
-                                  "resource://testing-common/FileTestUtils.jsm");
+ChromeUtils.defineModuleGetter(this, "FileUtils",
+                               "resource://gre/modules/FileUtils.jsm");
+ChromeUtils.defineModuleGetter(this, "NetUtil",
+                               "resource://gre/modules/NetUtil.jsm");
+ChromeUtils.defineModuleGetter(this, "Services",
+                               "resource://gre/modules/Services.jsm");
+ChromeUtils.defineModuleGetter(this, "FileTestUtils",
+                               "resource://testing-common/FileTestUtils.jsm");
 
 const BackgroundFileSaverOutputStream = Components.Constructor(
       "@mozilla.org/network/background-file-saver;1?mode=outputstream",
       "nsIBackgroundFileSaver");
 
 const BackgroundFileSaverStreamListener = Components.Constructor(
       "@mozilla.org/network/background-file-saver;1?mode=streamlistener",
       "nsIBackgroundFileSaver");
diff --git a/netwerk/test/unit/test_cache-entry-id.js b/netwerk/test/unit/test_cache-entry-id.js
--- a/netwerk/test/unit/test_cache-entry-id.js
+++ b/netwerk/test/unit/test_cache-entry-id.js
@@ -1,15 +1,15 @@
 /**
  * Test for the "CacheEntryId" under several cases.
  */
 
-Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/NetUtil.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://testing-common/httpd.js");
+ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "URL", function() {
   return "http://localhost:" + httpServer.identity.primaryPort + "/content";
 });
 
 var httpServer = null;
 
 const responseContent = "response body";
diff --git a/netwerk/test/unit/test_signature_extraction.js b/netwerk/test/unit/test_signature_extraction.js
--- a/netwerk/test/unit/test_signature_extraction.js
+++ b/netwerk/test/unit/test_signature_extraction.js
@@ -6,24 +6,24 @@
 /**
  * This file tests signature extraction using Windows Authenticode APIs of
  * downloaded files.
  */
 
 ////////////////////////////////////////////////////////////////////////////////
 //// Globals
 
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
-                                  "resource://gre/modules/FileUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
-                                  "resource://gre/modules/NetUtil.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "FileTestUtils",
-                                  "resource://testing-common/FileTestUtils.jsm");
+ChromeUtils.defineModuleGetter(this, "FileUtils",
+                               "resource://gre/modules/FileUtils.jsm");
+ChromeUtils.defineModuleGetter(this, "NetUtil",
+                               "resource://gre/modules/NetUtil.jsm");
+ChromeUtils.defineModuleGetter(this, "FileTestUtils",
+                               "resource://testing-common/FileTestUtils.jsm");
 
 const BackgroundFileSaverOutputStream = Components.Constructor(
       "@mozilla.org/network/background-file-saver;1?mode=outputstream",
       "nsIBackgroundFileSaver");
 
 const StringInputStream = Components.Constructor(
       "@mozilla.org/io/string-input-stream;1",
       "nsIStringInputStream",
diff --git a/netwerk/test/unit_ipc/test_alt-data_simple_wrap.js b/netwerk/test/unit_ipc/test_alt-data_simple_wrap.js
--- a/netwerk/test/unit_ipc/test_alt-data_simple_wrap.js
+++ b/netwerk/test/unit_ipc/test_alt-data_simple_wrap.js
@@ -1,9 +1,9 @@
-Cu.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 // needs to be rooted
 var cacheFlushObserver = { observe: function() {
   cacheFlushObserver = null;
   do_send_remote_message('flushed');
 }};
 
 function run_test() {
diff --git a/netwerk/test/unit_ipc/test_cache-entry-id_wrap.js b/netwerk/test/unit_ipc/test_cache-entry-id_wrap.js
--- a/netwerk/test/unit_ipc/test_cache-entry-id_wrap.js
+++ b/netwerk/test/unit_ipc/test_cache-entry-id_wrap.js
@@ -1,9 +1,9 @@
-Cu.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 function run_test() {
   do_get_profile();
   run_test_in_child("../unit/test_cache-entry-id.js");
 
   do_await_remote_message('flush').then(() => {
     let p = new Promise(resolve => {
       Services.cache2.QueryInterface(Ci.nsICacheTesting)
diff --git a/netwerk/test/unit_ipc/test_multipart_streamconv_wrap.js b/netwerk/test/unit_ipc/test_multipart_streamconv_wrap.js
--- a/netwerk/test/unit_ipc/test_multipart_streamconv_wrap.js
+++ b/netwerk/test/unit_ipc/test_multipart_streamconv_wrap.js
@@ -1,5 +1,5 @@
-Cu.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 function run_test() {
   Services.prefs.setBoolPref("network.cookie.ipc.sync", true);
   run_test_in_child("../unit/test_multipart_streamconv.js");
 }
diff --git a/testing/marionette/test_evaluate.js b/testing/marionette/test_evaluate.js
--- a/testing/marionette/test_evaluate.js
+++ b/testing/marionette/test_evaluate.js
@@ -1,12 +1,12 @@
 const {utils: Cu} = Components;
 
-const {element, WebElement} = Cu.import("chrome://marionette/content/element.js", {});
-const {evaluate} = Cu.import("chrome://marionette/content/evaluate.js", {});
+const {element, WebElement} = ChromeUtils.import("chrome://marionette/content/element.js", {});
+const {evaluate} = ChromeUtils.import("chrome://marionette/content/evaluate.js", {});
 
 const SVGNS = "http://www.w3.org/2000/svg";
 const XBLNS = "http://www.mozilla.org/xbl";
 const XHTMLNS = "http://www.w3.org/1999/xhtml";
 const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
 class Element {
   constructor(tagName, attrs = {}) {
diff --git a/testing/mochitest/browser-test.js b/testing/mochitest/browser-test.js
--- a/testing/mochitest/browser-test.js
+++ b/testing/mochitest/browser-test.js
@@ -161,17 +161,17 @@ function Tester(aTests, structuredLogger
 
   this.SimpleTestOriginal = {};
   SIMPLETEST_OVERRIDES.forEach(m => {
     this.SimpleTestOriginal[m] = this.SimpleTest[m];
   });
 
   this._coverageCollector = null;
 
-  const XPCOMUtilsMod = Components.utils.import("resource://gre/modules/XPCOMUtils.jsm", {});
+  const XPCOMUtilsMod = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", {});
 
   // Avoid failing tests when XPCOMUtils.defineLazyScriptGetter is used.
   XPCOMUtilsMod.Services = Object.create(Services, {
     scriptloader: {
       configurable: true,
       writable: true,
       value: {
         loadSubScript: (url, obj, charset) => {
diff --git a/testing/talos/talos/tests/cpstartup/bootstrap.js b/testing/talos/talos/tests/cpstartup/bootstrap.js
--- a/testing/talos/talos/tests/cpstartup/bootstrap.js
+++ b/testing/talos/talos/tests/cpstartup/bootstrap.js
@@ -1,15 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
-Cu.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const PREALLOCATED_PREF = "dom.ipc.processPrelaunch.enabled";
 
 const TARGET_URI = "chrome://cpstartup/content/target.html";
 
 /**
  * The purpose of this test it to measure the performance of a content process startup.
  *
diff --git a/toolkit/components/extensions/FindContent.jsm b/toolkit/components/extensions/FindContent.jsm
--- a/toolkit/components/extensions/FindContent.jsm
+++ b/toolkit/components/extensions/FindContent.jsm
@@ -7,23 +7,23 @@
 var EXPORTED_SYMBOLS = ["FindContent"];
 
 /* exported FindContent */
 
 const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
 
 class FindContent {
   constructor(docShell) {
-    const {Finder} = Cu.import("resource://gre/modules/Finder.jsm", {});
+    const {Finder} = ChromeUtils.import("resource://gre/modules/Finder.jsm", {});
     this.finder = new Finder(docShell);
   }
 
   get iterator() {
     if (!this._iterator) {
-      const {FinderIterator} = Cu.import("resource://gre/modules/FinderIterator.jsm", {});
+      const {FinderIterator} = ChromeUtils.import("resource://gre/modules/FinderIterator.jsm", {});
       this._iterator = Object.assign({}, FinderIterator);
 
       // Native FinderIterator._collectFrames skips frames if they are scrolled out
       // of viewport.  Override with method that doesn't do that.
       this._iterator._collectFrames = (window) => {
         let frames = [];
         if (!("frames" in window) || !window.frames.length) {
           return frames;
@@ -40,17 +40,17 @@ class FindContent {
         return frames;
       };
     }
     return this._iterator;
   }
 
   get highlighter() {
     if (!this._highlighter) {
-      const {FinderHighlighter} = Cu.import("resource://gre/modules/FinderHighlighter.jsm", {});
+      const {FinderHighlighter} = ChromeUtils.import("resource://gre/modules/FinderHighlighter.jsm", {});
       this._highlighter = new FinderHighlighter(this.finder);
     }
     return this._highlighter;
   }
 
   /**
    * findRanges
    *
diff --git a/toolkit/components/extensions/ext-contentScripts.js b/toolkit/components/extensions/ext-contentScripts.js
--- a/toolkit/components/extensions/ext-contentScripts.js
+++ b/toolkit/components/extensions/ext-contentScripts.js
@@ -1,16 +1,16 @@
 /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
 /* exported registerContentScript, unregisterContentScript */
 /* global registerContentScript, unregisterContentScript */
 
-Cu.import("resource://gre/modules/ExtensionUtils.jsm");
+ChromeUtils.import("resource://gre/modules/ExtensionUtils.jsm");
 
 var {
   ExtensionError,
   getUniqueId,
 } = ExtensionUtils;
 
 /**
  * Represents (in the main browser process) a content script registered
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_alarms.js b/toolkit/components/extensions/test/xpcshell/test_ext_alarms.js
--- a/toolkit/components/extensions/test/xpcshell/test_ext_alarms.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_alarms.js
@@ -1,14 +1,14 @@
 /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set sts=2 sw=2 et tw=80: */
 /* eslint-disable mozilla/no-arbitrary-setTimeout */
 "use strict";
 
-Cu.import("resource://testing-common/PromiseTestUtils.jsm");
+ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm");
 
 PromiseTestUtils.whitelistRejectionsGlobally(/Message manager disconnected/);
 
 add_task(async function test_alarm_without_permissions() {
   function backgroundScript() {
     browser.test.assertTrue(!browser.alarms,
                             "alarm API is not available when the alarm permission is not required");
     browser.test.notifyPass("alarms_permission");
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_contextual_identities.js b/toolkit/components/extensions/test/xpcshell/test_ext_contextual_identities.js
--- a/toolkit/components/extensions/test/xpcshell/test_ext_contextual_identities.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_contextual_identities.js
@@ -1,14 +1,14 @@
 "use strict";
 
 do_get_profile();
 
-XPCOMUtils.defineLazyModuleGetter(this, "AddonManager",
-                                  "resource://modules/AddonManager.jsm");
+ChromeUtils.defineModuleGetter(this, "AddonManager",
+                               "resource://modules/AddonManager.jsm");
 
 function waitForPrefChange(pref) {
   return new Promise(resolve => {
     function observeChange() {
       Services.prefs.removeObserver(pref, observeChange);
       resolve();
     }
 
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_downloads_private.js b/toolkit/components/extensions/test/xpcshell/test_ext_downloads_private.js
--- a/toolkit/components/extensions/test/xpcshell/test_ext_downloads_private.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_downloads_private.js
@@ -1,13 +1,13 @@
 /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
-Cu.import("resource://gre/modules/Downloads.jsm");
+ChromeUtils.import("resource://gre/modules/Downloads.jsm");
 
 const server = createHttpServer();
 server.registerDirectory("/data/", do_get_file("data"));
 
 const BASE = `http://localhost:${server.identity.primaryPort}/data`;
 const TXT_FILE = "file_download.txt";
 const TXT_URL = BASE + "/" + TXT_FILE;
 
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_storage.js b/toolkit/components/extensions/test/xpcshell/test_ext_storage.js
--- a/toolkit/components/extensions/test/xpcshell/test_ext_storage.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_storage.js
@@ -70,17 +70,17 @@ add_task(async function test_local_cache
   extension.sendMessage("check");
   await extension.awaitMessage("check-done");
 
   await extension.unload();
 });
 
 add_task(async function test_single_initialization() {
   // Grab access to this via the backstage pass to check if we're calling openConnection too often.
-  const {FirefoxAdapter} = Cu.import("resource://gre/modules/ExtensionStorageSync.jsm", {});
+  const {FirefoxAdapter} = ChromeUtils.import("resource://gre/modules/ExtensionStorageSync.jsm", {});
   const origOpenConnection = FirefoxAdapter.openConnection;
   let callCount = 0;
   FirefoxAdapter.openConnection = function(...args) {
     ++callCount;
     return origOpenConnection.apply(this, args);
   };
   function background() {
     let promises = ["foo", "bar", "baz", "quux"].map(key =>
diff --git a/toolkit/components/extensions/test/xpcshell/test_proxy_scripts_results.js b/toolkit/components/extensions/test/xpcshell/test_proxy_scripts_results.js
--- a/toolkit/components/extensions/test/xpcshell/test_proxy_scripts_results.js
+++ b/toolkit/components/extensions/test/xpcshell/test_proxy_scripts_results.js
@@ -1,14 +1,14 @@
 "use strict";
 
 /* eslint no-unused-vars: ["error", {"args": "none", "varsIgnorePattern": "^(FindProxyForURL)$"}] */
 
-Cu.import("resource://gre/modules/Extension.jsm");
-Cu.import("resource://gre/modules/ProxyScriptContext.jsm");
+ChromeUtils.import("resource://gre/modules/Extension.jsm");
+ChromeUtils.import("resource://gre/modules/ProxyScriptContext.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "gProxyService",
                                    "@mozilla.org/network/protocol-proxy-service;1",
                                    "nsIProtocolProxyService");
 
 const TRANSPARENT_PROXY_RESOLVES_HOST = Ci.nsIProxyInfo.TRANSPARENT_PROXY_RESOLVES_HOST;
 
 let extension;
diff --git a/toolkit/components/places/tests/favicons/test_incremental_vacuum.js b/toolkit/components/places/tests/favicons/test_incremental_vacuum.js
--- a/toolkit/components/places/tests/favicons/test_incremental_vacuum.js
+++ b/toolkit/components/places/tests/favicons/test_incremental_vacuum.js
@@ -1,14 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests incremental vacuum of the favicons database.
 
-Cu.import("resource://gre/modules/PlacesDBUtils.jsm");
+ChromeUtils.import("resource://gre/modules/PlacesDBUtils.jsm");
 
 add_task(async function() {
   let icon = {
     file: do_get_file("noise.png"),
     mimetype: "image/png"
   };
 
   let url = "http://foo.bar/";
diff --git a/toolkit/components/satchel/test/unit/test_notify.js b/toolkit/components/satchel/test/unit/test_notify.js
--- a/toolkit/components/satchel/test/unit/test_notify.js
+++ b/toolkit/components/satchel/test/unit/test_notify.js
@@ -1,16 +1,16 @@
 /*
  * Test suite for satchel notifications
  *
  * Tests notifications dispatched when modifying form history.
  *
  */
 
-XPCOMUtils.defineLazyModuleGetter(this, "setTimeout", "resource://gre/modules/Timer.jsm");
+ChromeUtils.defineModuleGetter(this, "setTimeout", "resource://gre/modules/Timer.jsm");
 
 const TestObserver = {
   observed: [],
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
   observe(subject, topic, data) {
     if (subject instanceof Ci.nsISupportsString) {
       subject = subject.toString();
     }
diff --git a/toolkit/modules/tests/browser/browser_WebRequest_ancestors.js b/toolkit/modules/tests/browser/browser_WebRequest_ancestors.js
--- a/toolkit/modules/tests/browser/browser_WebRequest_ancestors.js
+++ b/toolkit/modules/tests/browser/browser_WebRequest_ancestors.js
@@ -1,16 +1,16 @@
 "use strict";
 
 var { interfaces: Ci, classes: Cc, utils: Cu, results: Cr } = Components;
 
 Cu.importGlobalProperties(["XMLHttpRequest"]);
 
-var {WebRequest} = Cu.import("resource://gre/modules/WebRequest.jsm", {});
-var {PromiseUtils} = Cu.import("resource://gre/modules/PromiseUtils.jsm", {});
+var {WebRequest} = ChromeUtils.import("resource://gre/modules/WebRequest.jsm", {});
+var {PromiseUtils} = ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm", {});
 
 add_task(async function test_ancestors_exist() {
   let deferred = PromiseUtils.defer();
   function onBeforeRequest(details) {
     info(`onBeforeRequest ${details.url}`);
     ok(typeof details.frameAncestors === "object", `ancestors exists [${typeof details.frameAncestors}]`);
     deferred.resolve();
   }
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_db_path.js b/toolkit/mozapps/extensions/test/xpcshell/test_db_path.js
--- a/toolkit/mozapps/extensions/test/xpcshell/test_db_path.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_db_path.js
@@ -1,12 +1,12 @@
 
-Components.utils.import("resource://testing-common/AddonTestUtils.jsm");
-Components.utils.import("resource://gre/modules/FileUtils.jsm");
-const { OS } = Components.utils.import("resource://gre/modules/osfile.jsm", {});
+ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
+ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm", {});
 
 let global = this;
 
 // Test that paths in the extensions database are stored properly
 // if they include non-ascii characters (see bug 1428234 for an example of
 // a past bug with such paths)
 add_task(async function test_non_ascii_path() {
   let env = Components.classes["@mozilla.org/process/environment;1"]
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_delay_update_webextension.js b/toolkit/mozapps/extensions/test/xpcshell/test_delay_update_webextension.js
--- a/toolkit/mozapps/extensions/test/xpcshell/test_delay_update_webextension.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_delay_update_webextension.js
@@ -11,17 +11,17 @@ ChromeUtils.import("resource://gre/modul
 
 if (AppConstants.platform == "win" && AppConstants.DEBUG) {
   // Shutdown timing is flaky in this test, and remote extensions
   // sometimes wind up leaving the XPI locked at the point when we try
   // to remove it.
   Services.prefs.setBoolPref("extensions.webextensions.remote", false);
 }
 
-Components.utils.import("resource://testing-common/PromiseTestUtils.jsm");
+ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm");
 
 PromiseTestUtils.expectUncaughtRejection(/Message manager disconnected/);
 
 /* globals browser*/
 
 const profileDir = gProfD.clone();
 profileDir.append("extensions");
 const stageDir = profileDir.clone();
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_temporary.js b/toolkit/mozapps/extensions/test/xpcshell/test_temporary.js
--- a/toolkit/mozapps/extensions/test/xpcshell/test_temporary.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_temporary.js
@@ -1,13 +1,13 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-Components.utils.import("resource://gre/modules/AppConstants.jsm");
+ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 
 const ID = "bootstrap1@tests.mozilla.org";
 const sampleRDFManifest = {
   id: ID,
   version: "1.0",
   bootstrap: true,
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_langpack.js b/toolkit/mozapps/extensions/test/xpcshell/test_webextension_langpack.js
--- a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_langpack.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_webextension_langpack.js
@@ -1,16 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-Components.utils.import("resource://gre/modules/AppConstants.jsm");
+ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 
-const { Services } = Components.utils.import("resource://gre/modules/Services.jsm", {});
-const { L10nRegistry } = Components.utils.import("resource://gre/modules/L10nRegistry.jsm", {});
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
+const { L10nRegistry } = ChromeUtils.import("resource://gre/modules/L10nRegistry.jsm", {});
 
 const ID = "langpack-und@test.mozilla.org";
 
 const profileDir = gProfD.clone();
 profileDir.append("extensions");
 
 createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "58");
 startupManager();
diff --git a/uriloader/exthandler/tests/mochitest/browser_download_privatebrowsing.js b/uriloader/exthandler/tests/mochitest/browser_download_privatebrowsing.js
--- a/uriloader/exthandler/tests/mochitest/browser_download_privatebrowsing.js
+++ b/uriloader/exthandler/tests/mochitest/browser_download_privatebrowsing.js
@@ -3,20 +3,20 @@
 
 /**
  * Tests that downloads started from a private window by clicking on a link end
  * up in the global list of private downloads (see bug 1367581).
  */
 
 "use strict";
 
-Cu.import("resource://gre/modules/Downloads.jsm", this);
-Cu.import("resource://gre/modules/DownloadPaths.jsm", this);
-Cu.import("resource://testing-common/FileTestUtils.jsm", this);
-Cu.import("resource://testing-common/MockRegistrar.jsm", this);
+ChromeUtils.import("resource://gre/modules/Downloads.jsm", this);
+ChromeUtils.import("resource://gre/modules/DownloadPaths.jsm", this);
+ChromeUtils.import("resource://testing-common/FileTestUtils.jsm", this);
+ChromeUtils.import("resource://testing-common/MockRegistrar.jsm", this);
 
 add_task(async function test_setup() {
   // Save downloads to disk without showing the dialog.
   let cid = MockRegistrar.register("@mozilla.org/helperapplauncherdialog;1", {
     QueryInterface: XPCOMUtils.generateQI([Ci.nsIHelperAppLauncherDialog]),
     show(launcher) {
       launcher.saveToDisk(null, false);
     },