Bug 1812977 - Remove now unnecessary import-globals-from statements in devtools. r=Gijs

Differential Revision: https://phabricator.services.mozilla.com/D168071
2023-01-30 19:33:38 +00:00 · 2023-01-30 19:33:38 +00:00 · 4fcd8b1d2b
--- a/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_devtoolstoolbox_breakpoint.js
+++ b/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_devtoolstoolbox_breakpoint.js
@ -3,7 +3,6 @@

 "use strict";

-/* import-globals-from ../../../debugger/test/mochitest/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/shared-head.js",
  this
--- a/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_profiler_dialog.js
+++ b/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_profiler_dialog.js
@ -3,7 +3,6 @@

 "use strict";

-/* import-globals-from ../../../performance-new/test/browser/helpers.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/performance-new/test/browser/helpers.js",
  this
--- a/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_serviceworker_console.js
+++ b/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_serviceworker_console.js
@ -9,7 +9,6 @@ Services.scriptloader.loadSubScript(
  this
 );

-/* import-globals-from ../../../debugger/test/mochitest/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/shared-head.js",
  this
--- a/devtools/client/aboutdebugging/test/browser/head.js
+++ b/devtools/client/aboutdebugging/test/browser/head.js
@ -5,7 +5,6 @@

 /* eslint-env browser */
 /* eslint no-unused-vars: [2, {"vars": "local"}] */
-/* import-globals-from ../../../shared/test/shared-head.js */

 // Load the shared-head file first.
 Services.scriptloader.loadSubScript(
@ -16,7 +15,6 @@ Services.scriptloader.loadSubScript(
 /* import-globals-from helper-mocks.js */
 Services.scriptloader.loadSubScript(CHROME_URL_ROOT + "helper-mocks.js", this);

-/* import-globals-from ../../../webconsole/test/browser/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/webconsole/test/browser/shared-head.js",
  this
--- a/devtools/client/accessibility/test/browser/head.js
+++ b/devtools/client/accessibility/test/browser/head.js
@ -1,10 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
 http://creativecommons.org/publicdomain/zero/1.0/ */

-/* import-globals-from ../../../shared/test/shared-head.js */
-/* import-globals-from ../../../inspector/test/shared-head.js */
-/* import-globals-from ../../../shared/test/telemetry-test-helpers.js */
-
 /* global waitUntilState, gBrowser */
 /* exported addTestTab, checkTreeState, checkSidebarState, checkAuditState, selectRow,
            toggleRow, toggleMenuItem, addA11yPanelTestsTask, navigate,
--- a/devtools/client/application/test/browser/browser_application_panel_debug-service-worker.js
+++ b/devtools/client/application/test/browser/browser_application_panel_debug-service-worker.js
@ -3,7 +3,6 @@

 "use strict";

-/* import-globals-from ../../../debugger/test/mochitest/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/shared-head.js",
  this
--- a/devtools/client/application/test/browser/head.js
+++ b/devtools/client/application/test/browser/head.js
@ -3,7 +3,6 @@

 /* eslint-env browser */
 /* eslint no-unused-vars: [2, {"vars": "local"}] */
-/* import-globals-from ../../../shared/test/shared-head.js */

 "use strict";

--- a/devtools/client/debugger/test/mochitest/browser_dbg-backgroundtask-debugging.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg-backgroundtask-debugging.js
@ -21,7 +21,6 @@

 requestLongerTimeout(4);

-/* import-globals-from ../../../framework/browser-toolbox/test/helpers-browser-toolbox.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/framework/browser-toolbox/test/helpers-browser-toolbox.js",
  this
--- a/devtools/client/debugger/test/mochitest/browser_dbg-browser-toolbox-unselected-pause.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg-browser-toolbox-unselected-pause.js
@ -9,7 +9,6 @@

 requestLongerTimeout(4);

-/* import-globals-from ../../../framework/browser-toolbox/test/helpers-browser-toolbox.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/framework/browser-toolbox/test/helpers-browser-toolbox.js",
  this
--- a/devtools/client/debugger/test/mochitest/browser_dbg-browser-toolbox-workers.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg-browser-toolbox-workers.js
@ -9,7 +9,6 @@

 requestLongerTimeout(4);

-/* import-globals-from ../../../framework/browser-toolbox/test/helpers-browser-toolbox.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/framework/browser-toolbox/test/helpers-browser-toolbox.js",
  this
--- a/devtools/client/debugger/test/mochitest/browser_dbg-dom-mutation-breakpoints-fission.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg-dom-mutation-breakpoints-fission.js
@ -7,7 +7,6 @@
 "use strict";

 // Import helpers for the inspector
-/* import-globals-from ../../../inspector/test/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/inspector/test/shared-head.js",
  this
--- a/devtools/client/debugger/test/mochitest/browser_dbg-dom-mutation-breakpoints.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg-dom-mutation-breakpoints.js
@ -7,7 +7,6 @@
 "use strict";

 // Import helpers for the inspector
-/* import-globals-from ../../../inspector/test/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/inspector/test/shared-head.js",
  this
--- a/devtools/client/debugger/test/mochitest/browser_dbg-features-browser-toolbox-source-tree.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg-features-browser-toolbox-source-tree.js
@ -10,7 +10,6 @@

 requestLongerTimeout(2);

-/* import-globals-from ../../../framework/browser-toolbox/test/helpers-browser-toolbox.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/framework/browser-toolbox/test/helpers-browser-toolbox.js",
  this
--- a/devtools/client/debugger/test/mochitest/head.js
+++ b/devtools/client/debugger/test/mochitest/head.js
@ -20,19 +20,16 @@ const EXAMPLE_REMOTE_URL =
  "https://example.org/browser/devtools/client/debugger/test/mochitest/examples/";

 // shared-head.js handles imports, constants, and utility functions
-/* import-globals-from ../../../shared/test/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
  this
 );

-/* import-globals-from ./shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/shared-head.js",
  this
 );

-/* import-globals-from ../../../webconsole/test/browser/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/webconsole/test/browser/shared-head.js",
  this
--- a/devtools/client/dom/test/head.js
+++ b/devtools/client/dom/test/head.js
@ -1,7 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
 * http://creativecommons.org/publicdomain/zero/1.0/ */
 /* eslint no-unused-vars: [2, {"vars": "local", "args": "none"}] */
-/* import-globals-from ../../shared/test/shared-head.js */

 "use strict";

--- a/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_fission_contentframe_inspector.js
+++ b/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_fission_contentframe_inspector.js
@ -8,7 +8,6 @@ const { PromiseTestUtils } = ChromeUtils.importESModule(
 );
 PromiseTestUtils.allowMatchingRejectionsGlobally(/File closed/);

-/* import-globals-from ../../../inspector/test/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/inspector/test/shared-head.js",
  this
--- a/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_fission_inspector.js
+++ b/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_fission_inspector.js
@ -8,7 +8,6 @@ const { PromiseTestUtils } = ChromeUtils.importESModule(
 );
 PromiseTestUtils.allowMatchingRejectionsGlobally(/File closed/);

-/* import-globals-from ../../../inspector/test/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/inspector/test/shared-head.js",
  this
--- a/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_fission_inspector_webextension.js
+++ b/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_fission_inspector_webextension.js
@ -8,7 +8,6 @@ const { PromiseTestUtils } = ChromeUtils.importESModule(
 );
 PromiseTestUtils.allowMatchingRejectionsGlobally(/File closed/);

-/* import-globals-from ../../../inspector/test/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/inspector/test/shared-head.js",
  this
--- a/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_navigate_tab.js
+++ b/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_navigate_tab.js
@ -8,7 +8,6 @@ const { PromiseTestUtils } = ChromeUtils.importESModule(
 );
 PromiseTestUtils.allowMatchingRejectionsGlobally(/File closed/);

-/* import-globals-from ../../../inspector/test/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/inspector/test/shared-head.js",
  this
--- a/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_print_preview.js
+++ b/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_print_preview.js
@ -8,7 +8,6 @@ const { PromiseTestUtils } = ChromeUtils.importESModule(
 );
 PromiseTestUtils.allowMatchingRejectionsGlobally(/File closed/);

-/* import-globals-from ../../../inspector/test/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/inspector/test/shared-head.js",
  this
--- a/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_ruleview_stylesheet.js
+++ b/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_ruleview_stylesheet.js
@ -8,7 +8,6 @@ const { PromiseTestUtils } = ChromeUtils.importESModule(
 );
 PromiseTestUtils.allowMatchingRejectionsGlobally(/File closed/);

-/* import-globals-from ../../../inspector/test/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/inspector/test/shared-head.js",
  this
--- a/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_unavailable_children.js
+++ b/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_unavailable_children.js
@ -8,7 +8,6 @@ const { PromiseTestUtils } = ChromeUtils.importESModule(
 );
 PromiseTestUtils.allowMatchingRejectionsGlobally(/File closed/);

-/* import-globals-from ../../../inspector/test/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/inspector/test/shared-head.js",
  this
--- a/devtools/client/framework/browser-toolbox/test/head.js
+++ b/devtools/client/framework/browser-toolbox/test/head.js
@ -1,16 +1,12 @@
 /* Any copyright is dedicated to the Public Domain.
 * http://creativecommons.org/publicdomain/zero/1.0/ */

-/* import-globals-from ../../../shared/test/shared-head.js */
-/* import-globals-from ../../../shared/test/telemetry-test-helpers.js */
-
 // shared-head.js handles imports, constants, and utility functions
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
  this
 );

-/* import-globals-from helpers-browser-toolbox.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/framework/browser-toolbox/test/helpers-browser-toolbox.js",
  this
--- a/devtools/client/framework/test/allocations/browser_allocations_reload_debugger.js
+++ b/devtools/client/framework/test/allocations/browser_allocations_reload_debugger.js
@ -5,7 +5,6 @@

 // Record allocations while reloading the page with the debugger opened

-/* import-globals-from reload-test.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/framework/test/allocations/reload-test.js",
  this
--- a/devtools/client/framework/test/allocations/browser_allocations_reload_inspector.js
+++ b/devtools/client/framework/test/allocations/browser_allocations_reload_inspector.js
@ -5,7 +5,6 @@

 // Record allocations while reloading the page with the inspector opened

-/* import-globals-from reload-test.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/framework/test/allocations/reload-test.js",
  this
--- a/devtools/client/framework/test/allocations/browser_allocations_reload_netmonitor.js
+++ b/devtools/client/framework/test/allocations/browser_allocations_reload_netmonitor.js
@ -5,7 +5,6 @@

 // Record allocations while reloading the page with the netmonitor opened

-/* import-globals-from reload-test.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/framework/test/allocations/reload-test.js",
  this
--- a/devtools/client/framework/test/allocations/browser_allocations_reload_webconsole.js
+++ b/devtools/client/framework/test/allocations/browser_allocations_reload_webconsole.js
@ -5,7 +5,6 @@

 // Record allocations while reloading the page with the webconsole opened

-/* import-globals-from reload-test.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/framework/test/allocations/reload-test.js",
  this
--- a/devtools/client/framework/test/browser_target_cached-resource.js
+++ b/devtools/client/framework/test/browser_target_cached-resource.js
@ -10,7 +10,6 @@ const TEST_URI =
 const PARENT_MESSAGE = "Hello from parent";
 const CHILD_MESSAGE = "Hello from child";

-/* import-globals-from ../../webconsole/test/browser/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/webconsole/test/browser/shared-head.js",
  this
--- a/devtools/client/framework/test/browser_toolbox_backward_forward_navigation.js
+++ b/devtools/client/framework/test/browser_toolbox_backward_forward_navigation.js
@ -10,7 +10,6 @@ const FILENAME = "doc_backward_forward_navigation.html";
 const TEST_URI_ORG = `${URL_ROOT_ORG_SSL}${FILENAME}`;
 const TEST_URI_COM = `${URL_ROOT_COM_SSL}${FILENAME}`;

-/* import-globals-from ../../debugger/test/mochitest/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/shared-head.js",
  this
--- a/devtools/client/framework/test/browser_toolbox_error_count.js
+++ b/devtools/client/framework/test/browser_toolbox_error_count.js
@ -5,7 +5,6 @@
 // Test for error icon and the error count displayed at right of the
 // toolbox toolbar

-/* import-globals-from ../../webconsole/test/browser/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/webconsole/test/browser/shared-head.js",
  this
--- a/devtools/client/framework/test/browser_toolbox_hosts_telemetry.js
+++ b/devtools/client/framework/test/browser_toolbox_hosts_telemetry.js
@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
 * http://creativecommons.org/publicdomain/zero/1.0/ */

-/* import-globals-from head.js */
-
 "use strict";

 const { Toolbox } = require("resource://devtools/client/framework/toolbox.js");
--- a/devtools/client/framework/test/head.js
+++ b/devtools/client/framework/test/head.js
@ -1,9 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
 * http://creativecommons.org/publicdomain/zero/1.0/ */

-/* import-globals-from ../../shared/test/shared-head.js */
-/* import-globals-from ../../shared/test/telemetry-test-helpers.js */
-
 // shared-head.js handles imports, constants, and utility functions
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
--- a/devtools/client/framework/test/metrics/head.js
+++ b/devtools/client/framework/test/metrics/head.js
@ -1,9 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
 * http://creativecommons.org/publicdomain/zero/1.0/ */

-/* import-globals-from ../../../shared/test/shared-head.js */
-/* import-globals-from ../../../shared/test/telemetry-test-helpers.js */
-
 // shared-head.js handles imports, constants, and utility functions
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
--- a/devtools/client/inspector/animation/test/head.js
+++ b/devtools/client/inspector/animation/test/head.js
@ -4,7 +4,6 @@

 "use strict";

-/* import-globals-from ../../test/head.js */
 // Import the inspector's head.js first (which itself imports shared-head.js).
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/inspector/test/head.js",
--- a/devtools/client/inspector/boxmodel/test/head.js
+++ b/devtools/client/inspector/boxmodel/test/head.js
@ -1,8 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
 http://creativecommons.org/publicdomain/zero/1.0/ */
 /* eslint no-unused-vars: [2, {"vars": "local"}] */
-/* import-globals-from ../../../shared/test/shared-head.js */
-/* import-globals-from ../../test/head.js */
+
 "use strict";

 // Import the inspector's head.js first (which itself imports shared-head.js).
--- a/devtools/client/inspector/changes/test/head.js
+++ b/devtools/client/inspector/changes/test/head.js
@ -2,9 +2,7 @@
 * 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 no-unused-vars: [2, {"vars": "local"}] */
-/* import-globals-from ../../test/head.js */
-/* import-globals-from ../../../inspector/rules/test/head.js */
-/* import-globals-from ../../../inspector/test/shared-head.js */
+
 "use strict";

 // Load the Rule view's test/head.js to make use of its helpers.
--- a/devtools/client/inspector/compatibility/test/browser/head.js
+++ b/devtools/client/inspector/compatibility/test/browser/head.js
@ -2,7 +2,6 @@
   http://creativecommons.org/publicdomain/zero/1.0/ */

 "use strict";
-/* import-globals-from ../../../rules/test/head.js */

 // Import the rule view's head.js first (which itself imports inspector's head.js and shared-head.js).
 Services.scriptloader.loadSubScript(
--- a/devtools/client/inspector/computed/test/head.js
+++ b/devtools/client/inspector/computed/test/head.js
@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
 http://creativecommons.org/publicdomain/zero/1.0/ */
 /* eslint no-unused-vars: [2, {"vars": "local"}] */
-/* import-globals-from ../../test/head.js */
+
 "use strict";

 // Import the inspector's head.js first (which itself imports shared-head.js).
--- a/devtools/client/inspector/extensions/test/head.js
+++ b/devtools/client/inspector/extensions/test/head.js
@ -3,7 +3,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 /* eslint no-unused-vars: [2, {"vars": "local"}] */
-/* import-globals-from ../../test/head.js */

 "use strict";

--- a/devtools/client/inspector/flexbox/test/head.js
+++ b/devtools/client/inspector/flexbox/test/head.js
@ -1,9 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
 http://creativecommons.org/publicdomain/zero/1.0/ */
 /* eslint no-unused-vars: [2, {"vars": "local"}] */
-/* import-globals-from ../../test/head.js */
-/* import-globals-from ../../../inspector/rules/test/head.js */
-/* import-globals-from ../../../inspector/test/shared-head.js */
+
 "use strict";

 // Import the inspector's head.js first (which itself imports shared-head.js).
--- a/devtools/client/inspector/fonts/test/head.js
+++ b/devtools/client/inspector/fonts/test/head.js
@ -2,8 +2,7 @@
 * 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 no-unused-vars: [2, {"vars": "local"}] */
-/* import-globals-from ../../../shared/test/telemetry-test-helpers.js */
-/* import-globals-from ../../test/head.js */
+
 "use strict";

 // Import the inspector's head.js first (which itself imports shared-head.js).
--- a/devtools/client/inspector/grids/test/head.js
+++ b/devtools/client/inspector/grids/test/head.js
@ -1,9 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
 http://creativecommons.org/publicdomain/zero/1.0/ */
 /* eslint no-unused-vars: [2, {"vars": "local"}] */
-/* import-globals-from ../../../shared/test/shared-head.js */
-/* import-globals-from ../../../shared/test/telemetry-test-helpers.js */
-/* import-globals-from ../../test/head.js */
+
 "use strict";

 // Import the inspector's head.js first (which itself imports shared-head.js).
--- a/devtools/client/inspector/markup/test/browser_markup_dom_mutation_breakpoints.js
+++ b/devtools/client/inspector/markup/test/browser_markup_dom_mutation_breakpoints.js
@ -4,7 +4,6 @@

 "use strict";

-/* import-globals-from ../../../debugger/test/mochitest/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/shared-head.js",
  this
--- a/devtools/client/inspector/markup/test/browser_markup_links_06.js
+++ b/devtools/client/inspector/markup/test/browser_markup_links_06.js
@ -8,7 +8,6 @@

 const TEST_URL = URL_ROOT + "doc_markup_links.html";

-/* import-globals-from ../../../debugger/test/mochitest/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/shared-head.js",
  this
--- a/devtools/client/inspector/markup/test/browser_markup_shadowdom_open_debugger.js
+++ b/devtools/client/inspector/markup/test/browser_markup_shadowdom_open_debugger.js
@ -9,7 +9,6 @@
 // Test that the markup view is correctly updated to show those items if the custom
 // element definition happens after opening the inspector.

-/* import-globals-from ../../../debugger/test/mochitest/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/shared-head.js",
  this
--- a/devtools/client/inspector/markup/test/browser_markup_shadowdom_open_debugger_pretty_printed.js
+++ b/devtools/client/inspector/markup/test/browser_markup_shadowdom_open_debugger_pretty_printed.js
@ -6,7 +6,6 @@
 // Test that clicking on the "custom" badge opens the debugger to the pretty-printed
 // custom element definition.

-/* import-globals-from ../../../debugger/test/mochitest/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/shared-head.js",
  this
--- a/devtools/client/inspector/markup/test/browser_markup_view-source.js
+++ b/devtools/client/inspector/markup/test/browser_markup_view-source.js
@ -3,7 +3,6 @@

 "use strict";

-/* import-globals-from ../../../debugger/test/mochitest/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/shared-head.js",
  this
--- a/devtools/client/inspector/markup/test/head.js
+++ b/devtools/client/inspector/markup/test/head.js
@ -2,8 +2,7 @@
 * 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 no-unused-vars: [2, {"vars": "local"}] */
-/* import-globals-from ../../../shared/test/telemetry-test-helpers.js */
-/* import-globals-from ../../test/head.js */
+
 "use strict";

 // Import the inspector's head.js first (which itself imports shared-head.js).
--- a/devtools/client/inspector/rules/test/browser_rules_update_mask_image_cors.js
+++ b/devtools/client/inspector/rules/test/browser_rules_update_mask_image_cors.js
@ -3,7 +3,6 @@

 "use strict";

-/* import-globals-from ../../../webconsole/test/browser/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/webconsole/test/browser/shared-head.js",
  this
--- a/devtools/client/inspector/rules/test/head.js
+++ b/devtools/client/inspector/rules/test/head.js
@ -1,8 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
 http://creativecommons.org/publicdomain/zero/1.0/ */
 /* eslint no-unused-vars: [2, {"vars": "local"}] */
-/* import-globals-from ../../../shared/test/telemetry-test-helpers.js */
-/* import-globals-from ../../test/head.js */
+
 "use strict";

 // Import the inspector's head.js first (which itself imports shared-head.js).
--- a/devtools/client/inspector/shared/test/head.js
+++ b/devtools/client/inspector/shared/test/head.js
@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
 http://creativecommons.org/publicdomain/zero/1.0/ */
 /* eslint no-unused-vars: [2, {"vars": "local"}] */
-/* import-globals-from ../../test/head.js */
+
 "use strict";

 // Import the inspector's head.js first (which itself imports shared-head.js).
--- a/devtools/client/inspector/test/browser_inspector_highlighter-07.js
+++ b/devtools/client/inspector/test/browser_inspector_highlighter-07.js
@ -2,7 +2,6 @@
   http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";

-/* import-globals-from ../../debugger/test/mochitest/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/shared-head.js",
  this
--- a/devtools/client/inspector/test/head.js
+++ b/devtools/client/inspector/test/head.js
@ -2,8 +2,7 @@
 * 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 no-unused-vars: [2, {"vars": "local"}] */
-/* import-globals-from ../../shared/test/shared-head.js */
-/* import-globals-from ../../inspector/test/shared-head.js */
+
 "use strict";

 // Load the shared-head file first.
--- a/devtools/client/jsonview/test/head.js
+++ b/devtools/client/jsonview/test/head.js
@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
 * http://creativecommons.org/publicdomain/zero/1.0/ */
 /* eslint no-unused-vars: [2, {"vars": "local", "args": "none"}] */
-/* import-globals-from ../../shared/test/shared-head.js */
-/* import-globals-from ../../framework/test/head.js */

 "use strict";

--- a/devtools/client/memory/test/browser/head.js
+++ b/devtools/client/memory/test/browser/head.js
@ -4,7 +4,6 @@
 "use strict";

 // Load the shared test helpers into this compartment.
-/* import-globals-from ../../../shared/test/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
  this
--- a/devtools/client/netmonitor/test/browser_net_clear.js
+++ b/devtools/client/netmonitor/test/browser_net_clear.js
@ -3,7 +3,6 @@

 "use strict";

-/* import-globals-from ../../webconsole/test/browser/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/webconsole/test/browser/shared-head.js",
  this
--- a/devtools/client/netmonitor/test/browser_net_view-source-debugger.js
+++ b/devtools/client/netmonitor/test/browser_net_view-source-debugger.js
@ -11,7 +11,6 @@ const { PromiseTestUtils } = ChromeUtils.importESModule(
 PromiseTestUtils.allowMatchingRejectionsGlobally(/Component not initialized/);
 PromiseTestUtils.allowMatchingRejectionsGlobally(/Connection closed/);

-/* import-globals-from ../../debugger/test/mochitest/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/shared-head.js",
  this
--- a/devtools/client/netmonitor/test/head.js
+++ b/devtools/client/netmonitor/test/head.js
@ -7,7 +7,6 @@
 * tests without referencing head.js explicitly.
 */

-/* import-globals-from ../../shared/test/shared-head.js */
 /* exported Toolbox, restartNetMonitor, teardown, waitForExplicitFinish,
   verifyRequestItemTarget, waitFor, waitForDispatch, testFilterButtons,
   performRequestsInContent, waitForNetworkEvents, selectIndexAndWaitForSourceEditor,
--- a/devtools/client/performance-new/test/browser/head.js
+++ b/devtools/client/performance-new/test/browser/head.js
@ -34,7 +34,6 @@ const { require } = ChromeUtils.importESModule(
  }
 }

-/* import-globals-from ./helpers.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/performance-new/test/browser/helpers.js",
  this
--- a/devtools/client/responsive/test/browser/head.js
+++ b/devtools/client/responsive/test/browser/head.js
@ -4,8 +4,6 @@
 "use strict";

 /* eslint no-unused-vars: [2, {"vars": "local"}] */
-/* import-globals-from ../../../shared/test/shared-head.js */
-/* import-globals-from ../../../inspector/test/shared-head.js */

 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
--- a/devtools/client/shared/components/test/browser/browser_notification_box_basic.js
+++ b/devtools/client/shared/components/test/browser/browser_notification_box_basic.js
@ -3,8 +3,6 @@

 "use strict";

-/* import-globals-from ../../../../shared/test/shared-head.js */
-
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
  this
--- a/devtools/client/shared/components/test/browser/browser_reps_stubs.js
+++ b/devtools/client/shared/components/test/browser/browser_reps_stubs.js
@ -3,8 +3,6 @@

 "use strict";

-/* import-globals-from ../../../../shared/test/shared-head.js */
-
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
  this
--- a/devtools/client/shared/source-map-loader/test/browser/head.js
+++ b/devtools/client/shared/source-map-loader/test/browser/head.js
@ -3,7 +3,6 @@

 "use strict";

-/* import-globals-from ../../../../shared/test/shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
  this
--- a/devtools/client/shared/sourceeditor/test/head.js
+++ b/devtools/client/shared/sourceeditor/test/head.js
@ -1,6 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
   http://creativecommons.org/publicdomain/zero/1.0/ */
-/* import-globals-from ../../../shared/test/shared-head.js */
+
 /* exported promiseWaitForFocus, setup, ch, teardown, loadHelperScript,
            limit, ch, read, codemirrorSetStatus */

--- a/devtools/client/shared/test/head.js
+++ b/devtools/client/shared/test/head.js
@ -2,12 +2,10 @@
 * 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 no-unused-vars: [2, {"vars": "local", "args": "none"}] */
-/* import-globals-from telemetry-test-helpers.js */

 "use strict";

 // shared-head.js handles imports, constants, and utility functions
-/* import-globals-from shared-head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
  this
--- a/devtools/client/storage/test/browser_storage_basic.js
+++ b/devtools/client/storage/test/browser_storage_basic.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/. */

-/* import-globals-from head.js */
-
 // Basic test to assert that the storage tree and table corresponding to each
 // item in the storage tree is correctly displayed

--- a/devtools/client/storage/test/browser_storage_basic_with_fragment.js
+++ b/devtools/client/storage/test/browser_storage_basic_with_fragment.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/. */

-/* import-globals-from head.js */
-
 // A second basic test to assert that the storage tree and table corresponding
 // to each item in the storage tree is correctly displayed.

--- a/devtools/client/storage/test/browser_storage_cache_delete.js
+++ b/devtools/client/storage/test/browser_storage_cache_delete.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/. */

-/* import-globals-from ../../shared/test/shared-head.js */
-
 "use strict";

 // Test deleting a Cache object from the tree using context menu
--- a/devtools/client/storage/test/browser_storage_cache_navigation.js
+++ b/devtools/client/storage/test/browser_storage_cache_navigation.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/. */

-/* import-globals-from head.js */
-
 "use strict";

 add_task(async function() {
--- a/devtools/client/storage/test/browser_storage_cookies_delete_all.js
+++ b/devtools/client/storage/test/browser_storage_cookies_delete_all.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/. */

-/* import-globals-from ../../shared/test/shared-head.js */
-
 "use strict";

 // Test deleting all cookies
--- a/devtools/client/storage/test/browser_storage_cookies_domain.js
+++ b/devtools/client/storage/test/browser_storage_cookies_domain.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/. */

-/* import-globals-from ../../shared/test/shared-head.js */
-
 "use strict";

 // Test that cookies with domain equal to full host name are listed.
--- a/devtools/client/storage/test/browser_storage_cookies_domain_port.js
+++ b/devtools/client/storage/test/browser_storage_cookies_domain_port.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/. */

-/* import-globals-from ../../shared/test/shared-head.js */
-
 "use strict";

 // Test that cookies with domain equal to full host name and port are listed.
--- a/devtools/client/storage/test/browser_storage_cookies_navigation.js
+++ b/devtools/client/storage/test/browser_storage_cookies_navigation.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/. */

-/* import-globals-from head.js */
 "use strict";

 add_task(async function() {
--- a/devtools/client/storage/test/browser_storage_cookies_samesite.js
+++ b/devtools/client/storage/test/browser_storage_cookies_samesite.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/. */

-/* import-globals-from ../../shared/test/shared-head.js */
-
 "use strict";

 // Test that the samesite cookie attribute is displayed correctly.
--- a/devtools/client/storage/test/browser_storage_delete.js
+++ b/devtools/client/storage/test/browser_storage_delete.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/. */

-/* import-globals-from ../../shared/test/shared-head.js */
-
 "use strict";

 // Test deleting storage items
--- a/devtools/client/storage/test/browser_storage_delete_all.js
+++ b/devtools/client/storage/test/browser_storage_delete_all.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/. */

-/* import-globals-from ../../shared/test/shared-head.js */
-
 "use strict";

 // Test deleting all storage items
--- a/devtools/client/storage/test/browser_storage_delete_tree.js
+++ b/devtools/client/storage/test/browser_storage_delete_tree.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/. */

-/* import-globals-from ../../shared/test/shared-head.js */
-
 "use strict";

 // Test deleting all storage items from the tree.
--- a/devtools/client/storage/test/browser_storage_delete_usercontextid.js
+++ b/devtools/client/storage/test/browser_storage_delete_usercontextid.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/. */

-/* import-globals-from ../../shared/test/shared-head.js */
-
 "use strict";

 // Test deleting storage items with userContextId.
--- a/devtools/client/storage/test/browser_storage_dfpi.js
+++ b/devtools/client/storage/test/browser_storage_dfpi.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/. */

-/* import-globals-from head.js */
-
 // Basic test to assert that the storage tree and table corresponding to each
 // item in the storage tree is correctly displayed

--- a/devtools/client/storage/test/browser_storage_dfpi_always_partition_storage.js
+++ b/devtools/client/storage/test/browser_storage_dfpi_always_partition_storage.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/. */

-/* import-globals-from head.js */
-
 // Basic test to assert that the storage tree and table corresponding to each
 // item in the storage tree is correctly displayed, bearing in mind the origin
 // is partitioned when always_partition_third_party_non_cookie_storage is true.
--- a/devtools/client/storage/test/browser_storage_dom_cache_disabled.js
+++ b/devtools/client/storage/test/browser_storage_dom_cache_disabled.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/. */

-/* import-globals-from ../../shared/test/shared-head.js */
-
 "use strict";

 // Test the storage inspector when dom.caches.enabled=false.
--- a/devtools/client/storage/test/browser_storage_file_url.js
+++ b/devtools/client/storage/test/browser_storage_file_url.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/. */

-/* import-globals-from head.js */
-
 // Test to verify that various storage types work when using file:// URLs.

 "use strict";
--- a/devtools/client/storage/test/browser_storage_fission_cache.js
+++ b/devtools/client/storage/test/browser_storage_fission_cache.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/. */

-/* import-globals-from head.js */
-
 "use strict";

 // Bug 1746646: Make mochitests work with TCP enabled (cookieBehavior = 5)
--- a/devtools/client/storage/test/browser_storage_fission_cookies.js
+++ b/devtools/client/storage/test/browser_storage_fission_cookies.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/. */

-/* import-globals-from head.js */
-
 "use strict";

 add_task(async function() {
--- a/devtools/client/storage/test/browser_storage_fission_indexeddb.js
+++ b/devtools/client/storage/test/browser_storage_fission_indexeddb.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/. */

-/* import-globals-from head.js */
-
 "use strict";

 add_task(async function() {
--- a/devtools/client/storage/test/browser_storage_indexeddb_add_button_hidden.js
+++ b/devtools/client/storage/test/browser_storage_indexeddb_add_button_hidden.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/. */

-/* import-globals-from ../../shared/test/shared-head.js */
-
 "use strict";

 // Test that the add button is hidden for the indexedDB storage type.
--- a/devtools/client/storage/test/browser_storage_indexeddb_delete.js
+++ b/devtools/client/storage/test/browser_storage_indexeddb_delete.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/. */

-/* import-globals-from ../../shared/test/shared-head.js */
-
 "use strict";

 // Test deleting indexedDB database from the tree using context menu
--- a/devtools/client/storage/test/browser_storage_indexeddb_delete_blocked.js
+++ b/devtools/client/storage/test/browser_storage_indexeddb_delete_blocked.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/. */

-/* import-globals-from ../../shared/test/shared-head.js */
-
 "use strict";

 // Test what happens when deleting indexedDB database is blocked
--- a/devtools/client/storage/test/browser_storage_indexeddb_hide_internal_dbs.js
+++ b/devtools/client/storage/test/browser_storage_indexeddb_hide_internal_dbs.js
@ -2,12 +2,8 @@
 * 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/. */

-/* import-globals-from ../../shared/test/shared-head.js */
-
 "use strict";

-/* global gToolbox */
-/* import-globals-from ../../framework/browser-toolbox/test/helpers-browser-toolbox.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/framework/browser-toolbox/test/helpers-browser-toolbox.js",
  this
--- a/devtools/client/storage/test/browser_storage_indexeddb_navigation.js
+++ b/devtools/client/storage/test/browser_storage_indexeddb_navigation.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/. */

-/* import-globals-from head.js */
-
 "use strict";

 requestLongerTimeout(3);
--- a/devtools/client/storage/test/browser_storage_localstorage_navigation.js
+++ b/devtools/client/storage/test/browser_storage_localstorage_navigation.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/. */

-/* import-globals-from head.js */
-
 "use strict";

 add_task(async function() {
--- a/devtools/client/storage/test/browser_storage_localstorage_rapid_add_remove.js
+++ b/devtools/client/storage/test/browser_storage_localstorage_rapid_add_remove.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/. */

-/* import-globals-from head.js */
-
 // Basic test to check the rapid adding and removing of localStorage entries.

 "use strict";
--- a/devtools/client/storage/test/browser_storage_sessionstorage_navigation.js
+++ b/devtools/client/storage/test/browser_storage_sessionstorage_navigation.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/. */

-/* import-globals-from head.js */
-
 "use strict";

 add_task(async function() {
--- a/devtools/client/styleeditor/test/browser_toolbox_styleeditor.js
+++ b/devtools/client/styleeditor/test/browser_toolbox_styleeditor.js
@ -16,7 +16,6 @@ const TEST_URI = `data:text/html,<!DOCTYPE html>
  <body>Test browser toolbox</body>`;

 /* global gToolbox */
-/* import-globals-from ../../framework/browser-toolbox/test/helpers-browser-toolbox.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/framework/browser-toolbox/test/helpers-browser-toolbox.js",
  this
--- a/devtools/client/styleeditor/test/head.js
+++ b/devtools/client/styleeditor/test/head.js
@ -6,7 +6,6 @@

 "use strict";

-/* import-globals-from ../../inspector/shared/test/head.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/inspector/shared/test/head.js",
  this
--- a/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_in_debugger_stackframe.js
+++ b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_in_debugger_stackframe.js
@ -5,7 +5,6 @@
 // stackframe from the js debugger.

 "use strict";
-/* import-globals-from head.js*/

 const TEST_URI =
  "http://example.com/browser/devtools/client/webconsole/" +
--- a/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_mapped_variables.js
+++ b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_mapped_variables.js
@ -5,7 +5,6 @@
 // on an equal footing with variables from the generated source.

 "use strict";
-/* import-globals-from head.js*/

 const TEST_URI =
  "http://example.com/browser/devtools/client/webconsole/" +
--- a/devtools/client/webconsole/test/browser/browser_toolbox_console_new_process.js
+++ b/devtools/client/webconsole/test/browser/browser_toolbox_console_new_process.js
@ -18,7 +18,6 @@ const EXAMPLE_URI =
  "test/browser/test-console.html";

 /* global gToolbox */
-/* import-globals-from ../../../framework/browser-toolbox/test/helpers-browser-toolbox.js */
 Services.scriptloader.loadSubScript(
  "chrome://mochitests/content/browser/devtools/client/framework/browser-toolbox/test/helpers-browser-toolbox.js",
  this
--- a/devtools/client/webconsole/test/browser/browser_webconsole_eval_in_debugger_stackframe.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_eval_in_debugger_stackframe.js
@ -5,7 +5,6 @@
 // from the js debugger.

 "use strict";
-/* import-globals-from head.js*/

 const TEST_URI =
  "http://example.com/browser/devtools/client/webconsole/" +
--- a/devtools/client/webconsole/test/browser/browser_webconsole_select_all.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_select_all.js
@ -6,8 +6,6 @@
 // Test that the global Firefox "Select All" functionality (e.g. Edit >
 // Select All) works properly in the Web Console.

-/* import-globals-from head.js */
-
 const TEST_URI = "http://example.com/";

 add_task(async function testSelectAll() {
--- a/Показать больше
+++ b/Показать больше