Bug 1478305 - Remove unnecessary imports and fix ESLint warnings about unused variables for toolkit/. r=mossop

MozReview-Commit-ID: CB8xT8c5E4L

--HG--
extra : rebase_source : d19443e823ff4f7a6830bf97bef1257176b830af

toolkit/components/extensions/parent/ext-tabs-base.js

@@ -7,8 +7,6 @@
 
 /* globals EventEmitter */
 
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
 ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
                                "resource://gre/modules/PrivateBrowsingUtils.jsm");
 ChromeUtils.defineModuleGetter(this, "Services",

toolkit/components/extensions/test/mochitest/chrome_head.js

@@ -1,4 +1,6 @@
 "use strict";
 
+/* eslint-disable no-unused-vars */
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+/* eslint-enable no-unused-vars */

toolkit/components/extensions/test/mochitest/test_ext_webrequest_auth.html

@@ -130,7 +130,6 @@ add_task(async function test_webRequest_auth_nonblocking_forwardAuthPrompt2() {
 
   let chromeScript = SpecialPowers.loadChromeScript(() => {
     ChromeUtils.import("resource://gre/modules/Services.jsm");
-    ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
     let observer = channel => {
       if (!(channel instanceof Ci.nsIHttpChannel && channel.URI.host === "mochi.test")) {

toolkit/components/passwordmgr/test/mochitest/test_prompt_http.html

@@ -28,6 +28,7 @@ const AUTHENTICATE_PATH = new URL("authenticate.sjs", window.location.href).path
 let chromeScript = runInParent(SimpleTest.getTestFileURL("pwmgr_common.js"));
 
 runInParent(() => {
+  // eslint-disable-next-line no-shadow
   const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
 
   let login3A, login3B, login4;

toolkit/components/passwordmgr/test/pwmgr_common.js

@@ -241,6 +241,7 @@ function dumpLogin(label, login) {
 }
 
 function getRecipeParent() {
+  // eslint-disable-next-line no-shadow
   var { LoginManagerParent } = SpecialPowers.Cu.import("resource://gre/modules/LoginManagerParent.jsm", {});
   if (!LoginManagerParent.recipeParentPromise) {
     return null;
@@ -457,6 +458,7 @@ if (this.addMessageListener) {
   });
 
 
+  // eslint-disable-next-line no-shadow
   let { LoginHelper } = SpecialPowers.Cu.import("resource://gre/modules/LoginHelper.jsm", {});
   /**
    * Proxy for Services.logins (nsILoginManager).

toolkit/components/satchel/formSubmitListener.js

@@ -8,7 +8,6 @@ ChromeUtils.defineModuleGetter(this, "CreditCard",
                                "resource://gre/modules/CreditCard.jsm");
 
 (function() {
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
 

toolkit/modules/addons/WebNavigationContent.js

@@ -2,7 +2,6 @@
 
 /* eslint-env mozilla/frame-script */
 
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 ChromeUtils.defineModuleGetter(this, "WebNavigationFrames",

toolkit/modules/addons/WebRequestContent.js

@@ -7,7 +7,6 @@
 
 "use strict";
 
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 ChromeUtils.defineModuleGetter(this, "WebRequestCommon",

toolkit/mozapps/extensions/amWebAPI.js

@@ -5,7 +5,6 @@
 "use strict";
 
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyPreferenceGetter(this, "WEBEXT_PERMISSION_PROMPTS",
                                       "extensions.webextPermissionPrompts", false);

toolkit/mozapps/extensions/content/extensions.js

@@ -11,9 +11,7 @@
 ChromeUtils.import("resource://gre/modules/DeferredTask.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/DownloadUtils.jsm");
 ChromeUtils.import("resource://gre/modules/AddonManager.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 ChromeUtils.import("resource://gre/modules/addons/AddonRepository.jsm");
 ChromeUtils.import("resource://gre/modules/addons/AddonSettings.jsm");
 

toolkit/mozapps/extensions/test/xpcshell/data/from_sources/bootstrap.js

@@ -1 +1 @@
-ChromeUtils.import("resource://xpcshell-data/BootstrapMonitor.jsm").monitor(this);
+ChromeUtils.import("resource://xpcshell-data/BootstrapMonitor.jsm", {}).monitor(this);

toolkit/mozapps/extensions/test/xpcshell/data/system_addons/bootstrap.js

@@ -1 +1 @@
-ChromeUtils.import("resource://xpcshell-data/BootstrapMonitor.jsm").monitor(this);
+ChromeUtils.import("resource://xpcshell-data/BootstrapMonitor.jsm", {}).monitor(this);

toolkit/mozapps/extensions/test/xpcshell/data/test_temporary/bootstrap.js

@@ -1 +1 @@
-ChromeUtils.import("resource://xpcshell-data/BootstrapMonitor.jsm").monitor(this);
+ChromeUtils.import("resource://xpcshell-data/BootstrapMonitor.jsm", {}).monitor(this);

toolkit/mozapps/extensions/test/xpcshell/test_blocklist_gfx.js

@@ -1,4 +1,3 @@
-ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser"]);

toolkit/mozapps/extensions/test/xpcshell/test_blocklist_plugin_outdated.js

@@ -5,7 +5,6 @@
 const Cm = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
 
 ChromeUtils.import("resource://testing-common/httpd.js");
-ChromeUtils.import("resource://testing-common/MockRegistrar.jsm");
 
 const nsIBLS = Ci.nsIBlocklistService;
 

toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js

@@ -25,7 +25,6 @@
 
 const URI_EXTENSION_BLOCKLIST_DIALOG = "chrome://mozapps/content/extensions/blocklist.xul";
 
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 ChromeUtils.import("resource://testing-common/MockRegistrar.jsm");
 
 // Allow insecure updates

toolkit/mozapps/extensions/test/xpcshell/test_db_path.js

@@ -1,6 +1,5 @@
 
 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;
@@ -52,4 +51,3 @@ add_task(async function test_non_ascii_path() {
   Assert.ok(data.addons[1].path.startsWith(profileDir),
             "path property for extension installed at runtime has the proper profile directory");
 });
-

toolkit/mozapps/extensions/test/xpcshell/test_duplicateplugins.js

@@ -2,8 +2,6 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-ChromeUtils.import("resource://testing-common/MockRegistrar.jsm");
-
 // This verifies that duplicate plugins are coalesced and maintain their ID
 // across restarts.
 

toolkit/mozapps/extensions/test/xpcshell/test_safemode.js

@@ -2,8 +2,6 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-
 // Tests that extensions behave correctly in safe mode
 
 var addon1 = {

toolkit/mozapps/extensions/test/xpcshell/test_softblocked.js

@@ -4,7 +4,6 @@
 
 const URI_EXTENSION_BLOCKLIST_DIALOG = "chrome://mozapps/content/extensions/blocklist.xul";
 
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 ChromeUtils.import("resource://testing-common/MockRegistrar.jsm");
 
 // Allow insecure updates

toolkit/mozapps/extensions/test/xpcshell/test_webextension.js

@@ -2,8 +2,6 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-
 const ID = "webextension1@tests.mozilla.org";
 
 const profileDir = gProfD.clone();

toolkit/mozapps/extensions/test/xpcshell/test_webextension_install.js

@@ -1,6 +1,4 @@
 
-ChromeUtils.import("resource://gre/modules/addons/AddonSettings.jsm");
-
 let profileDir;
 add_task(async function setup() {
   profileDir = gProfD.clone();

toolkit/mozapps/extensions/test/xpcshell/test_webextension_langpack.js

@@ -2,8 +2,6 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
 const { L10nRegistry } = ChromeUtils.import("resource://gre/modules/L10nRegistry.jsm", {});