Bug 1571466 - Cleanup unnecessary ESLint global definitions. r=mossop

These are raised as redeclares or unused variables by ESLint 6. Differential Revision: https://phabricator.services.mozilla.com/D37268 --HG-- extra : moz-landing-system : lando
2019-08-19 07:11:56 +00:00 · 2019-08-19 07:11:56 +00:00 · b1970e6a2f
--- a/browser/base/content/test/plugins/head.js
+++ b/browser/base/content/test/plugins/head.js
@ -19,7 +19,7 @@ XPCOMUtils.defineLazyServiceGetters(this, {

 // Various tests in this directory may define gTestBrowser, to use as the
 // default browser under test in some of the functions below.
-/* global gTestBrowser */
+/* global gTestBrowser:true */

 /**
 * Waits a specified number of miliseconds.
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@ -557,9 +557,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
  ReaderParent: "resource:///modules/ReaderParent.jsm",
 });

-/* global ContentPrefServiceParent:false, ContentSearch:false,
-          UpdateListener:false, webrtcUI:false */
-
 /**
 * IF YOU ADD OR REMOVE FROM THIS LIST, PLEASE UPDATE THE LIST ABOVE AS WELL.
 * XXX Bug 1325373 is for making eslint detect these automatically.
--- a/browser/components/extensions/test/browser/browser_ext_contextMenus.js
+++ b/browser/components/extensions/test/browser/browser_ext_contextMenus.js
@ -6,8 +6,7 @@ Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/browser/components/places/tests/browser/head.js",
  this
 );
-/* globals withSidebarTree, synthesizeClickOnSelectedTreeCell,
- * promiseLibrary, promiseLibraryClosed
+/* globals withSidebarTree, synthesizeClickOnSelectedTreeCell, promiseLibrary, promiseLibraryClosed
 */

 const PAGE =
--- a/browser/components/extensions/test/browser/browser_ext_pageAction_popup_resize.js
+++ b/browser/components/extensions/test/browser/browser_ext_pageAction_popup_resize.js
@ -13,7 +13,6 @@ add_task(async function testPageActionPopupResize() {
      },
    },
    background: function() {
-      /* global browser */
      browser.tabs.query({ active: true, currentWindow: true }, tabs => {
        const tabId = tabs[0].id;

--- a/browser/components/extensions/test/browser/browser_ext_tabs_discard.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_discard.js
@ -1,6 +1,6 @@
 /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set sts=2 sw=2 et tw=80: */
-/* global gBrowser SessionStore */
+/* global gBrowser */
 "use strict";

 add_task(async function test_discarded() {
--- a/browser/components/extensions/test/browser/browser_ext_tabs_highlight.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_highlight.js
@ -1,6 +1,6 @@
 /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set sts=2 sw=2 et tw=80: */
-/* global gBrowser SessionStore */
+/* global gBrowser */
 "use strict";

 add_task(async function test_highlighted() {
--- a/browser/components/newtab/lib/ActivityStreamMessageChannel.jsm
+++ b/browser/components/newtab/lib/ActivityStreamMessageChannel.jsm
@ -6,8 +6,8 @@

 const { AboutNewTab } = ChromeUtils.import(
  "resource:///modules/AboutNewTab.jsm"
-); // Remove when updating eslint-plugin-mozilla 0.14.0+
-/* globals RemotePages */ const { RemotePages } = ChromeUtils.import(
+);
+const { RemotePages } = ChromeUtils.import(
  "resource://gre/modules/remotepagemanager/RemotePageManagerParent.jsm"
 );

--- a/browser/components/newtab/lib/TelemetryFeed.jsm
+++ b/browser/components/newtab/lib/TelemetryFeed.jsm
@ -1,7 +1,6 @@
 /* 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/. */
-/* globals Services */

 "use strict";

--- a/browser/components/newtab/lib/UTEventReporting.jsm
+++ b/browser/components/newtab/lib/UTEventReporting.jsm
@ -1,7 +1,6 @@
 /* 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/. */
-/* globals Services */

 "use strict";

--- a/browser/components/payments/test/mochitest/test_basic_card_form.html
+++ b/browser/components/payments/test/mochitest/test_basic_card_form.html
@ -31,8 +31,6 @@ Test the basic-card-form element
 <script type="module">
 /** Test the basic-card-form element **/

-/* global sinon */
-
 import BasicCardForm from "../../res/containers/basic-card-form.js";

 let display = document.getElementById("display");
--- a/browser/components/payments/test/mochitest/test_payment_dialog_required_top_level_items.html
+++ b/browser/components/payments/test/mochitest/test_payment_dialog_required_top_level_items.html
@ -30,8 +30,6 @@ Test the payment-dialog custom element
 <script type="module">
 /** Test the payment-dialog element **/

-/* global sinon */
-
 import PaymentDialog from "../../res/containers/payment-dialog.js";

 let el1;
--- a/browser/extensions/formautofill/content/customElements.js
+++ b/browser/extensions/formautofill/content/customElements.js
@ -258,7 +258,6 @@
    }

    _adjustAcItem() {
-      /* global Cu */
      this._adjustAutofillItemLayout();
      this.setAttribute("formautofillattached", "true");

--- a/browser/extensions/formautofill/content/l10n.js
+++ b/browser/extensions/formautofill/content/l10n.js
@ -10,8 +10,6 @@
 * Fluent conversion
 */

-/* global content */
-
 const { FormAutofillUtils } = ChromeUtils.import(
  "resource://formautofill/FormAutofillUtils.jsm"
 );
--- a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_serviceworker_multie10s.js
+++ b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_serviceworker_multie10s.js
@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
   http://creativecommons.org/publicdomain/zero/1.0/ */

-/* global sendAsyncMessage */
-
 "use strict";

 /* import-globals-from helper-serviceworker.js */
--- a/devtools/client/aboutdebugging-new/test/browser/resources/test-temporary-extension/script.js
+++ b/devtools/client/aboutdebugging-new/test/browser/resources/test-temporary-extension/script.js
@ -2,7 +2,6 @@
 http://creativecommons.org/publicdomain/zero/1.0/ */

 /* eslint-env browser */
-/* global browser */

 "use strict";

--- a/devtools/client/aboutdebugging-new/test/jest/setup.js
+++ b/devtools/client/aboutdebugging-new/test/jest/setup.js
@ -4,8 +4,6 @@

 "use strict";

-/* global global */
-
 // Configure enzyme with React 16 adapter.
 const Enzyme = require("enzyme");
 const Adapter = require("enzyme-adapter-react-16");
--- a/devtools/client/accessibility/test/jest/components/badges.test.js
+++ b/devtools/client/accessibility/test/jest/components/badges.test.js
@ -4,8 +4,6 @@

 "use strict";

-/* global L10N */
-
 const { mount } = require("enzyme");

 const { createFactory } = require("devtools/client/shared/vendor/react");
--- a/devtools/client/debugger/src/actions/utils/middleware/history.js
+++ b/devtools/client/debugger/src/actions/utils/middleware/history.js
@ -3,7 +3,6 @@
 * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */

 // @flow
-/* global window */

 import { isDevelopment } from "devtools-environment";

--- a/devtools/client/debugger/src/actions/utils/middleware/log.js
+++ b/devtools/client/debugger/src/actions/utils/middleware/log.js
@ -1,7 +1,6 @@
 /* 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/>. */
-/* global window */

 // @flow

--- a/devtools/client/debugger/src/actions/utils/middleware/thunk.js
+++ b/devtools/client/debugger/src/actions/utils/middleware/thunk.js
@ -4,8 +4,6 @@

 // @flow

-/* global window */
-
 import type { ThunkArgs, ActionType } from "../../types";

 /**
--- a/devtools/client/debugger/src/actions/utils/middleware/timing.js
+++ b/devtools/client/debugger/src/actions/utils/middleware/timing.js
@ -4,8 +4,6 @@

 // @flow

-/* global window */
-
 /**
 * Redux middleware that sets performance markers for all actions such that they
 * will appear in performance tooling under the User Timing API
--- a/devtools/client/debugger/src/actions/utils/middleware/wait-service.js
+++ b/devtools/client/debugger/src/actions/utils/middleware/wait-service.js
@ -3,7 +3,6 @@
 * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */

 // @flow
-/* global window */

 /**
 * A middleware which acts like a service, because it is stateful
--- a/devtools/client/inspector/fonts/test/browser_fontinspector_editor-font-size-conversion.js
+++ b/devtools/client/inspector/fonts/test/browser_fontinspector_editor-font-size-conversion.js
@ -1,7 +1,6 @@
 /* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
   http://creativecommons.org/publicdomain/zero/1.0/ */
-/* global getPropertyValue waitFor */

 "use strict";

--- a/devtools/client/inspector/inspector.js
+++ b/devtools/client/inspector/inspector.js
@ -4,8 +4,6 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

-/* global window, BrowserLoader */
-
 "use strict";

 const Services = require("Services");
--- a/devtools/client/inspector/markup/test/browser_markup_events_chrome_blocked.js
+++ b/devtools/client/inspector/markup/test/browser_markup_events_chrome_blocked.js
@ -2,7 +2,6 @@
 /* Any copyright is dedicated to the Public Domain.
 http://creativecommons.org/publicdomain/zero/1.0/ */
 /* import-globals-from helper_events_test_runner.js */
-/* global sendAsyncMessage */

 "use strict";

--- a/devtools/client/inspector/markup/test/browser_markup_events_chrome_not_blocked.js
+++ b/devtools/client/inspector/markup/test/browser_markup_events_chrome_not_blocked.js
@ -2,7 +2,6 @@
 /* Any copyright is dedicated to the Public Domain.
 http://creativecommons.org/publicdomain/zero/1.0/ */
 /* import-globals-from helper_events_test_runner.js */
-/* global sendAsyncMessage */

 "use strict";

--- a/devtools/client/inspector/test/browser_inspector_reload_xul.js
+++ b/devtools/client/inspector/test/browser_inspector_reload_xul.js
@ -3,7 +3,6 @@
 /* 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/. */
-/* globals getTestActorWithoutToolbox */
 "use strict";

 // Tests for inspecting a node on a XUL document, spanning a tab reload.
--- a/devtools/client/performance/performance-controller.js
+++ b/devtools/client/performance/performance-controller.js
@ -1,7 +1,7 @@
 /* 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/. */
-/* globals $, $$ */
+/* globals $ */
 "use strict";

 const { PrefObserver } = require("devtools/client/shared/prefs");
--- a/devtools/client/performance/views/details-abstract-subview.js
+++ b/devtools/client/performance/views/details-abstract-subview.js
@ -1,7 +1,7 @@
 /* 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/. */
-/* globals $, $$, PerformanceController, OverviewView, DetailsView */
+/* globals PerformanceController, OverviewView, DetailsView */
 "use strict";

 const {
--- a/devtools/client/performance/views/details-js-call-tree.js
+++ b/devtools/client/performance/views/details-js-call-tree.js
@ -1,7 +1,7 @@
 /* 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/. */
-/* globals $, $$, PerformanceController */
+/* globals $, PerformanceController */
 "use strict";

 const { extend } = require("devtools/shared/extend");
--- a/devtools/client/performance/views/details-js-flamegraph.js
+++ b/devtools/client/performance/views/details-js-flamegraph.js
@ -1,7 +1,7 @@
 /* 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/. */
-/* globals $, $$, PerformanceController, OverviewView */
+/* globals $, PerformanceController, OverviewView */
 "use strict";

 const { extend } = require("devtools/shared/extend");
--- a/devtools/client/performance/views/details-memory-call-tree.js
+++ b/devtools/client/performance/views/details-memory-call-tree.js
@ -1,7 +1,7 @@
 /* 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/. */
-/* globals $, $$, PerformanceController, OverviewView */
+/* globals $, PerformanceController */
 "use strict";

 const { extend } = require("devtools/shared/extend");
--- a/devtools/client/performance/views/details-memory-flamegraph.js
+++ b/devtools/client/performance/views/details-memory-flamegraph.js
@ -1,7 +1,7 @@
 /* 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/. */
-/* globals $, $$, PerformanceController, OverviewView */
+/* globals $, PerformanceController, OverviewView */
 "use strict";

 const {
--- a/devtools/client/performance/views/details-waterfall.js
+++ b/devtools/client/performance/views/details-waterfall.js
@ -1,7 +1,7 @@
 /* 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/. */
-/* globals $, $$, PerformanceController, OverviewView, DetailsView */
+/* globals $, PerformanceController, OverviewView, DetailsView */
 "use strict";

 const { extend } = require("devtools/shared/extend");
--- a/devtools/client/performance/views/overview.js
+++ b/devtools/client/performance/views/overview.js
@ -1,7 +1,7 @@
 /* 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/. */
-/* globals $, $$, PerformanceController */
+/* globals $ PerformanceController */
 "use strict";

 // No sense updating the overview more often than receiving data from the
--- a/devtools/client/performance/views/recordings.js
+++ b/devtools/client/performance/views/recordings.js
@ -1,7 +1,7 @@
 /* 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/. */
-/* globals $, $$, PerformanceController */
+/* globals $, PerformanceController */
 "use strict";

 const EVENTS = require("../events");
--- a/devtools/client/shared/build/build-debugger.js
+++ b/devtools/client/shared/build/build-debugger.js
@ -1,7 +1,6 @@
 /* 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/>. */
-/* globals process, __filename, __dirname */

 "use strict";

--- a/devtools/server/actors/emulation/touch-simulator.js
+++ b/devtools/server/actors/emulation/touch-simulator.js
@ -2,8 +2,6 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

-/* global XPCNativeWrapper */
-
 "use strict";

 const { Services } = require("resource://gre/modules/Services.jsm");
--- a/devtools/server/actors/webconsole/eval-with-debugger.js
+++ b/devtools/server/actors/webconsole/eval-with-debugger.js
@ -4,8 +4,6 @@

 "use strict";

-/* global XPCNativeWrapper */
-
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");

 loader.lazyRequireGetter(
--- a/devtools/server/tests/browser/error-actor.js
+++ b/devtools/server/tests/browser/error-actor.js
@ -5,8 +5,6 @@

 "use strict";

-/* global DebuggerServer */
-
 /**
 * Test actor designed to check that clients are properly notified of errors when calling
 * methods on old style actors.
--- a/devtools/shared/base-loader.js
+++ b/devtools/shared/base-loader.js
@ -2,7 +2,6 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

-/* global __URI__ */
 /* exported Loader, resolveURI, Module, Require, unload */

 "use strict";
--- a/devtools/shared/transport/transport.js
+++ b/devtools/shared/transport/transport.js
@ -4,8 +4,6 @@

 "use strict";

-/* global uneval */
-
 const { Cc, Cr, CC } = require("chrome");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 const { dumpn, dumpv } = DevToolsUtils;
--- a/dom/manifest/ImageObjectProcessor.jsm
+++ b/dom/manifest/ImageObjectProcessor.jsm
@ -18,7 +18,7 @@
 *
 */
 /* exported EXPORTED_SYMBOLS*/
-/* globals Components */
+
 "use strict";

 const { XPCOMUtils } = ChromeUtils.import(
--- a/dom/manifest/ManifestFinder.jsm
+++ b/dom/manifest/ManifestFinder.jsm
@ -1,7 +1,6 @@
 /* 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 https://mozilla.org/MPL/2.0/. */
-/* globals Components, Task, PromiseMessage */
 "use strict";

 const { PromiseMessage } = ChromeUtils.import(
--- a/dom/manifest/ManifestObtainer.jsm
+++ b/dom/manifest/ManifestObtainer.jsm
@ -23,7 +23,6 @@
 *
 * exported ManifestObtainer
 */
-/* globals Components, Task, PromiseMessage, XPCOMUtils, ManifestProcessor, BrowserUtils*/
 "use strict";

 const { PromiseMessage } = ChromeUtils.import(
--- a/dom/manifest/ManifestProcessor.jsm
+++ b/dom/manifest/ManifestProcessor.jsm
@ -18,7 +18,6 @@
 * TODO: The constructor should accept the UA's supported orientations.
 * TODO: The constructor should accept the UA's supported display modes.
 */
-/* globals Components, ValueExtractor, ImageObjectProcessor, ConsoleAPI*/
 "use strict";

 const { XPCOMUtils } = ChromeUtils.import(
--- a/dom/manifest/ValueExtractor.jsm
+++ b/dom/manifest/ValueExtractor.jsm
@ -5,7 +5,6 @@
 * Helper functions extract values from manifest members
 * and reports conformance errors.
 */
-/* globals Components*/
 "use strict";

 const { XPCOMUtils } = ChromeUtils.import(
--- a/dom/manifest/test/browser_ManifestObtainer_obtain.js
+++ b/dom/manifest/test/browser_ManifestObtainer_obtain.js
@ -1,5 +1,5 @@
 // Used by JSHint:
-/* global ok, is, Cu, BrowserTestUtils, add_task, gBrowser, makeTestURL, requestLongerTimeout*/
+/* global ok, is, Cu, BrowserTestUtils, add_task, gBrowser, requestLongerTimeout*/
 "use strict";

 const { ManifestObtainer } = ChromeUtils.import(
--- a/dom/manifest/test/common.js
+++ b/dom/manifest/test/common.js
@ -1,7 +1,6 @@
 /**
 * Common infrastructure for manifest tests.
 **/
-/* globals SpecialPowers, ManifestProcessor*/
 "use strict";
 const { ManifestProcessor } = SpecialPowers.Cu.import(
  "resource://gre/modules/ManifestProcessor.jsm"
--- a/dom/presentation/provider/ControllerStateMachine.jsm
+++ b/dom/presentation/provider/ControllerStateMachine.jsm
@ -3,14 +3,11 @@
 /* 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/. */
-/* jshint esnext:true, globalstrict:true, moz:true, undef:true, unused:true */
-/* globals Components, dump */

 "use strict";

 var EXPORTED_SYMBOLS = ["ControllerStateMachine"]; // jshint ignore:line

-/* globals State, CommandType */
 const { CommandType, State } = ChromeUtils.import(
  "resource://gre/modules/presentation/StateMachineHelper.jsm"
 );
--- a/dom/presentation/provider/ReceiverStateMachine.jsm
+++ b/dom/presentation/provider/ReceiverStateMachine.jsm
@ -3,14 +3,11 @@
 /* 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/. */
-/* jshint esnext:true, globalstrict:true, moz:true, undef:true, unused:true */
-/* globals Components, dump */

 "use strict";

 var EXPORTED_SYMBOLS = ["ReceiverStateMachine"]; // jshint ignore:line

-/* globals State, CommandType */
 const { CommandType, State } = ChromeUtils.import(
  "resource://gre/modules/presentation/StateMachineHelper.jsm"
 );
--- a/dom/presentation/tests/xpcshell/test_multicast_dns_device_provider.js
+++ b/dom/presentation/tests/xpcshell/test_multicast_dns_device_provider.js
@ -1,7 +1,6 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* Any copyright is dedicated to the Public Domain.
 * http://creativecommons.org/publicdomain/zero/1.0/ */
-/* global Services, do_register_cleanup, do_test_pending */

 "use strict";

--- a/dom/presentation/tests/xpcshell/test_presentation_state_machine.js
+++ b/dom/presentation/tests/xpcshell/test_presentation_state_machine.js
@ -1,20 +1,15 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* Any copyright is dedicated to the Public Domain.
 * http://creativecommons.org/publicdomain/zero/1.0/ */
-/* jshint esnext:true, globalstrict:true, moz:true, undef:true, unused:true */
-/* globals Components,Assert,run_next_test,add_test,do_execute_soon */

 "use strict";

-/* globals ControllerStateMachine */
 const { ControllerStateMachine } = ChromeUtils.import(
  "resource://gre/modules/presentation/ControllerStateMachine.jsm"
 );
-/* globals ReceiverStateMachine */
 const { ReceiverStateMachine } = ChromeUtils.import(
  "resource://gre/modules/presentation/ReceiverStateMachine.jsm"
 );
-/* globals State */
 const { State } = ChromeUtils.import(
  "resource://gre/modules/presentation/StateMachineHelper.jsm"
 );
--- a/dom/tests/browser/browser_ConsoleAPI_originAttributes.js
+++ b/dom/tests/browser/browser_ConsoleAPI_originAttributes.js
@ -71,7 +71,6 @@ function test() {
  uuid = uuid.slice(1, -1); // Strip { and } off the UUID.

  const url = `moz-extension://${uuid}/`;
-  /* globals MatchPatternSet, WebExtensionPolicy */
  let policy = new WebExtensionPolicy({
    id: FAKE_ADDON_ID,
    mozExtensionHostname: uuid,
--- a/mobile/android/modules/Sanitizer.jsm
+++ b/mobile/android/modules/Sanitizer.jsm
@ -2,8 +2,6 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

-/* globals LoadContextInfo, FormHistory, Accounts */
-
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
  "resource://gre/modules/XPCOMUtils.jsm"
--- a/security/manager/ssl/tests/unit/test_toolkit_securityreporter.js
+++ b/security/manager/ssl/tests/unit/test_toolkit_securityreporter.js
@ -20,7 +20,7 @@ const Cm = Components.manager;
 const { updateAppInfo } = ChromeUtils.import(
  "resource://testing-common/AppInfo.jsm"
 ); // Imported via AppInfo.jsm.
-/* global updateAppInfo:false */ updateAppInfo();
+updateAppInfo();

 // We must get the profile before performing operations on the cert db.
 do_get_profile();
--- a/services/sync/modules/telemetry.js
+++ b/services/sync/modules/telemetry.js
@ -928,5 +928,4 @@ class SyncTelemetryImpl {
  }
 }

-/* global SyncTelemetry */
 var SyncTelemetry = new SyncTelemetryImpl(ENGINES);
--- a/services/sync/tests/unit/test_password_store.js
+++ b/services/sync/tests/unit/test_password_store.js
@ -292,7 +292,7 @@ async function test_apply_same_record_with_different_times() {
    true,
    true
  );
-  /* eslint-enable no-unsed-vars */
+  /* eslint-enable no-unused-vars */
 }

 async function test_LoginRec_toString(store, recordData) {
--- a/testing/marionette/transport.js
+++ b/testing/marionette/transport.js
@ -4,8 +4,6 @@

 "use strict";

-/* global Pipe, ScriptableInputStream */
-
 const CC = Components.Constructor;

 const { EventEmitter } = ChromeUtils.import(
--- a/testing/xpcshell/head.js
+++ b/testing/xpcshell/head.js
@ -22,6 +22,7 @@
 /* globals Cc, Ci */

 /* defined by this file but is defined as read-only for tests */
+// eslint-disable-next-line no-redeclare
 /* globals runningInParent: true */

 /* may be defined in test files */
--- a/toolkit/components/captivedetect/CaptiveDetect.jsm
+++ b/toolkit/components/captivedetect/CaptiveDetect.jsm
@ -528,13 +528,14 @@ CaptivePortalDetector.prototype = {
  },
 };

-/* globals debug: true */
 var debug;
 if (DEBUG) {
+  // eslint-disable-next-line no-global-assign
  debug = function(s) {
    dump("-*- CaptivePortalDetector component: " + s + "\n");
  };
 } else {
+  // eslint-disable-next-line no-global-assign
  debug = function(s) {};
 }

--- a/toolkit/components/extensions/Extension.jsm
+++ b/toolkit/components/extensions/Extension.jsm
@ -14,7 +14,6 @@ var EXPORTED_SYMBOLS = [
 ];

 /* exported Extension, ExtensionData */
-/* globals Extension ExtensionData */

 /*
 * This file is the main entry point for extensions. When an extension
--- a/toolkit/components/extensions/ExtensionContent.jsm
+++ b/toolkit/components/extensions/ExtensionContent.jsm
@ -7,8 +7,6 @@

 var EXPORTED_SYMBOLS = ["ExtensionContent"];

-/* globals ExtensionContent */
-
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
  "resource://gre/modules/XPCOMUtils.jsm"
--- a/toolkit/components/extensions/parent/ext-toolkit.js
+++ b/toolkit/components/extensions/parent/ext-toolkit.js
@ -10,7 +10,7 @@
            getContainerForCookieStoreId,
            isValidCookieStoreId, isContainerCookieStoreId,
            EventManager, URL */
-/* global getCookieStoreIdForTab:false, getCookieStoreIdForOriginAttributes:false,
+/* global getCookieStoreIdForTab:false,
          getCookieStoreIdForContainer:false,
          getContainerForCookieStoreId: false,
          isValidCookieStoreId:false, isContainerCookieStoreId:false,
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_additional_backgrounds_alignment.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_additional_backgrounds_alignment.js
@ -1,7 +1,5 @@
 "use strict";

-/* globals InspectorUtils */
-
 // Case 1 - When there is a theme_frame image and additional_backgrounds_alignment is not specified.
 // So background-position should default to "right top"
 add_task(async function test_default_additional_backgrounds_alignment() {
--- a/toolkit/components/extensions/test/xpcshell/test_ext_schemas_interactive.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_schemas_interactive.js
@ -57,7 +57,6 @@ let experimentFiles = {
    };
  },

-  /* globals ExtensionAPI */
  "child.js": () => {
    this.userinputtest = class extends ExtensionAPI {
      getAPI(context) {
--- a/toolkit/components/extensions/test/xpcshell/test_ext_storage_sync.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_storage_sync.js
@ -29,9 +29,6 @@ AddonTestUtils.init(this);

 createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "69");

-/* globals BulkKeyBundle, CommonUtils, EncryptionRemoteTransformer */
-/* globals Utils */
-
 function handleCannedResponse(cannedResponse, request, response) {
  response.setStatusLine(
    null,
--- a/toolkit/components/osfile/modules/osfile_win_back.jsm
+++ b/toolkit/components/osfile/modules/osfile_win_back.jsm
@ -20,7 +20,6 @@
 */

 /* eslint-env mozilla/chrome-worker, node */
-/* global OS */

 // eslint-disable-next-line no-lone-blocks
 {
--- a/toolkit/components/telemetry/geckoview/GeckoViewTelemetryController.jsm
+++ b/toolkit/components/telemetry/geckoview/GeckoViewTelemetryController.jsm
@ -23,8 +23,6 @@ const { debug, warn } = GeckoViewUtils.initLogging(

 var EXPORTED_SYMBOLS = ["GeckoViewTelemetryController"];

-/* global debug warn */
-
 // Persistent data loading topic - see TelemetryGeckoViewPersistence.cpp.
 const LOAD_COMPLETE_TOPIC = "internal-telemetry-geckoview-load-complete";

--- a/toolkit/components/telemetry/tests/unit/head.js
+++ b/toolkit/components/telemetry/tests/unit/head.js
@ -552,7 +552,6 @@ if (runningInParent) {
  );

  // This gets imported via fakeNow();
-  /* global TelemetrySend */
  registerCleanupFunction(() => TelemetrySend.shutdown());
 }

--- a/toolkit/content/browser-content.js
+++ b/toolkit/content/browser-content.js
@ -5,7 +5,6 @@

 /* eslint-env mozilla/frame-script */
 /* eslint no-unused-vars: ["error", {args: "none"}] */
-/* global sendAsyncMessage */

 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { XPCOMUtils } = ChromeUtils.import(
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
@ -12,10 +12,8 @@ const { XPCOMUtils } = ChromeUtils.import(
 const { AddonManager, AddonManagerPrivate } = ChromeUtils.import(
  "resource://gre/modules/AddonManager.jsm"
 );
-/* globals AddonManagerPrivate*/
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
-/* globals OS*/
 const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
 // These symbols are, unfortunately, accessed via the module global from
 // tests, and therefore cannot be lexical definitions.
--- a/toolkit/mozapps/extensions/internal/PluginProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/PluginProvider.jsm
@ -11,7 +11,6 @@ var EXPORTED_SYMBOLS = [];
 const { AddonManager, AddonManagerPrivate } = ChromeUtils.import(
  "resource://gre/modules/AddonManager.jsm"
 );
-/* globals AddonManagerPrivate*/
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");

 ChromeUtils.defineModuleGetter(
--- a/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
+++ b/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
@ -31,15 +31,12 @@ const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");

 XPCOMUtils.defineLazyGlobalGetters(this, ["XMLHttpRequest"]);

-/* globals GMPPrefs */
 ChromeUtils.defineModuleGetter(
  this,
  "GMPPrefs",
  "resource://gre/modules/GMPUtils.jsm"
 );

-/* globals OS */
-
 ChromeUtils.defineModuleGetter(
  this,
  "UpdateUtils",
--- a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
@ -51,12 +51,7 @@ XPCOMUtils.defineLazyPreferenceGetter(
 const { nsIBlocklistService } = Ci;

 // These are injected from XPIProvider.jsm
-/* globals
- *         BOOTSTRAP_REASONS,
- *         DB_SCHEMA,
- *         XPIStates,
- *         migrateAddonLoader
- */
+/* globals BOOTSTRAP_REASONS, DB_SCHEMA, XPIStates, migrateAddonLoader */

 for (let sym of [
  "BOOTSTRAP_REASONS",
--- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
@ -23,8 +23,6 @@ var EXPORTED_SYMBOLS = [
  "verifyBundleSignedState",
 ];

-/* globals DownloadAddonInstall, LocalAddonInstall */
-
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
  "resource://gre/modules/XPCOMUtils.jsm"
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@ -19,8 +19,6 @@

 var EXPORTED_SYMBOLS = ["XPIProvider", "XPIInternal"];

-/* globals WebExtensionPolicy */
-
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
  "resource://gre/modules/XPCOMUtils.jsm"
--- a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
+++ b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
@ -4020,6 +4020,7 @@ function start_httpserver() {
  gTestserver.registerPathHandler("/" + gHTTPHandlerPath, pathHandler);
  gTestserver.start(-1);
  let testserverPort = gTestserver.identity.primaryPort;
+  // eslint-disable-next-line no-global-assign
  gURLData = URL_HOST + ":" + testserverPort + "/";
  debugDump("http server port = " + testserverPort);
 }