[devtools] Import test runners in http/tests/devtools/sources/debugger

This CL replaces 'TestRunner.loadTestModule' calls with import
statements.

The CL was fully auto-generated by a small regex search&replace script.

R=jarin@chromium.org

Bug: 1442410
Change-Id: Iad08a1d11499557fc7ee134d636f96c3e808adc9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4561387
Commit-Queue: Simon Zünd <szuend@chromium.org>
Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1150384}

third_party/blink/web_tests/http/tests/devtools/sources/debugger/anonymous-script-with-source-map-breakpoint.js

@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(
       `Tests breakpoint in anonymous script with source map on reload.`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
   await SourcesTestRunner.startDebuggerTestPromise();
   TestRunner.navigatePromise(

third_party/blink/web_tests/http/tests/devtools/sources/debugger/async-callstack-fetch-expected.txt

@@ -3,21 +3,21 @@ Tests asynchronous call stacks for fetch.
 Set timer for test function.
 Captured call stacks in no particular order:
 Call stack:
-    0) chained1 (async-callstack-fetch.js:18)
+    0) chained1 (async-callstack-fetch.js:21)
     [Promise.then]
-    0) doFetch (async-callstack-fetch.js:17)
+    0) doFetch (async-callstack-fetch.js:20)
     [setTimeout]
-    0) testFunction (async-callstack-fetch.js:12)
+    0) testFunction (async-callstack-fetch.js:15)
     [setTimeout]
     0) scheduleTestFunction <omitted>
     <... skipped remaining frames ...>
 
 Call stack:
-    0) chained4 (async-callstack-fetch.js:22)
+    0) chained4 (async-callstack-fetch.js:25)
     [Promise.then]
-    0) doFetch (async-callstack-fetch.js:21)
+    0) doFetch (async-callstack-fetch.js:24)
     [setTimeout]
-    0) testFunction (async-callstack-fetch.js:12)
+    0) testFunction (async-callstack-fetch.js:15)
     [setTimeout]
     0) scheduleTestFunction <omitted>
     <... skipped remaining frames ...>

third_party/blink/web_tests/http/tests/devtools/sources/debugger/async-callstack-fetch.js

@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(`Tests asynchronous call stacks for fetch.\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
   await TestRunner.evaluateInPagePromise(`
       function testFunction()

third_party/blink/web_tests/http/tests/devtools/sources/debugger/async-callstack-network-initiator-expected.txt

@@ -1,18 +1,18 @@
 Tests asynchronous call stacks printed in console for a Network.Initiator.
 
 Set timer for test function.
-async-callstack-network-initiator.js:14 Console was cleared
-async-callstack-network-initiator.js:32 POST http://127.0.0.1:8000/failure/foo 404 (Not Found)
+async-callstack-network-initiator.js:18 Console was cleared
+async-callstack-network-initiator.js:36 POST http://127.0.0.1:8000/failure/foo 404 (Not Found)
 
-sendXHR @ async-callstack-network-initiator.js:32
+sendXHR @ async-callstack-network-initiator.js:36
 
-timeout2 @ async-callstack-network-initiator.js:25
+timeout2 @ async-callstack-network-initiator.js:29
 
 setTimeout (async)
 
-timeout1 @ async-callstack-network-initiator.js:20
+timeout1 @ async-callstack-network-initiator.js:24
 
 setTimeout (async)
 
-testFunction @ async-callstack-network-initiator.js:15
+testFunction @ async-callstack-network-initiator.js:19
 

third_party/blink/web_tests/http/tests/devtools/sources/debugger/async-callstack-network-initiator-image-expected.txt

@@ -1,4 +1,4 @@
 Tests asynchronous network initiator for image loaded from JS.
 
-async-callstack-network-initiator-image.js:18
+async-callstack-network-initiator-image.js:20
 

third_party/blink/web_tests/http/tests/devtools/sources/debugger/async-callstack-network-initiator-image.js

@@ -2,13 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+import {ConsoleTestRunner} from 'console_test_runner';
+import {NetworkTestRunner} from 'network_test_runner';
+
 (async function() {
   TestRunner.addResult(`Tests asynchronous network initiator for image loaded from JS.\n`);
   await TestRunner.loadLegacyModule('sources');
-  await TestRunner.loadTestModule('sources_test_runner');
   await TestRunner.loadLegacyModule('console');
-  await TestRunner.loadTestModule('console_test_runner');
-  await TestRunner.loadTestModule('network_test_runner');
   await TestRunner.loadLegacyModule('components');
   await TestRunner.showPanel('sources');
   await TestRunner.evaluateInPagePromise(`

third_party/blink/web_tests/http/tests/devtools/sources/debugger/async-callstack-network-initiator.js

@@ -2,10 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+import {ConsoleTestRunner} from 'console_test_runner';
+
 (async function() {
   TestRunner.addResult(`Tests asynchronous call stacks printed in console for a Network.Initiator.\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
-  await TestRunner.loadLegacyModule('console'); await TestRunner.loadTestModule('console_test_runner');
+  await TestRunner.loadLegacyModule('sources');
+  await TestRunner.loadLegacyModule('console');
   await TestRunner.showPanel('sources');
   await TestRunner.evaluateInPagePromise(`
       function testFunction()

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debug-inlined-modules-fragment-id.js

@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(
       `Tests that all inlined modules from the same document are shown in the same source frame with html script tags. Bug 1338257.\n`);
   await TestRunner.loadLegacyModule('sources');
-  await TestRunner.loadTestModule('sources_test_runner');
   await TestRunner.showPanel('sources');
 
   await TestRunner.navigatePromise('resources/inline-modules.html');

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debug-inlined-scripts-fragment-id.js

@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(
       `Tests that all inlined scripts from the same document are shown in the same source frame with html script tags. Bug 54544.\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
 
   await TestRunner.navigatePromise('resources/inline-scripts.html');

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debug-inlined-scripts.js

@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(
       `Tests that all inlined scripts from the same document are shown in the same source frame with html script tags.`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
   await TestRunner.navigatePromise('resources/debug-inline-scripts.html');
 

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debugger-autocontinue-on-syntax-error.js

@@ -2,11 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+import {ConsoleTestRunner} from 'console_test_runner';
+
 (async function() {
   TestRunner.addResult(
       `Tests that debugger won't stop on syntax errors even if "pause on uncaught exceptions" is on.\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
-  await TestRunner.loadLegacyModule('console'); await TestRunner.loadTestModule('console_test_runner');
+  await TestRunner.loadLegacyModule('sources');
+  await TestRunner.loadLegacyModule('console');
   await TestRunner.showPanel('sources');
 
   SourcesTestRunner.startDebuggerTest(step1);

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debugger-compile-and-run.js

@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(`Tests separate compilation and run.\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
 
   function printExceptionDetails(exceptionDetails) {

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debugger-cyclic-reference.js

@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(
       `Tests that debugging a page where Object prototype has a cyclic reference won't crash the browser.Bug 43558\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
   await TestRunner.evaluateInPagePromise(`
       Object.prototype.cyclicRef = Object.prototype;

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debugger-disable-enable.js

@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(`Tests that breakpoints are successfully restored after debugger disabling.\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
   await TestRunner.evaluateInPagePromise(`
       function testFunction()

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debugger-es6-harmony-scopes.js

@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(`Tests ES6 harmony scope sections.\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
   await TestRunner.loadHTML(`
       <input type="button" onclick="testFunction()" value="Test">

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debugger-minified-variables-evalution.js

@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(`Tests evaluation in minified scripts.\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
   await TestRunner.addScriptTag('resources/resolve-expressions-compressed.js');
 

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debugger-prototype-property.js

@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(
       `Tests that object's [[Prototype]] property is present in object properties section when script is paused on a breakpoint.Bug 41214\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
   await TestRunner.evaluateInPagePromise(`
       function C()

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debugger-reload-on-pause.js

@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(`Tests "reload" from within inspector window while on pause.\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
   await TestRunner.evaluateInPagePromise(`
       function testFunction()

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debugger-resolve-expression-line-by-line.js

@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(`Tests evaluation in webpack bundled scripts with 'line-by'line' source maps.\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
 
   // Bundle created using `npx webpack` with 'cheap-module-source-map'.

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debugger-return-value-expected.txt

@@ -2,6 +2,6 @@ Tests function's return value reported from backend.
 
 Set timer for test function.
 Call stack:
-    0) testFunction (debugger-return-value.js:19)
+    0) testFunction (debugger-return-value.js:22)
        <return>: 10
 

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debugger-return-value.js

@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(`Tests function's return value reported from backend.\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
   await TestRunner.evaluateInPagePromise(`
       function d()

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debugger-scope-minified-variables.js

@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(`Tests resolving variable names via source maps.\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
   await TestRunner.addScriptTag('resources/resolve-variable-names-compressed.js');
 

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debugger-scope-resolve-identifiers.js

@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(`Tests resolving variable names via source maps.\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
   await TestRunner.addScriptTag('resources/resolve-identifiers.js');
 

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debugger-scope-resolve-this.js

@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(`Tests resolving this object name via source maps.\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
   await TestRunner.addScriptTag('resources/resolve-this.js');
 

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debugger-scripts-reload.js

@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(`Tests that scripts list is cleared upon page reload.\n`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
 
   TestRunner.evaluateInPage('function foo() {} //# sourceURL=dummyScript.js', step1);

third_party/blink/web_tests/http/tests/devtools/sources/debugger/debugger-scripts.js

@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {TestRunner} from 'test_runner';
+import {SourcesTestRunner} from 'sources_test_runner';
+
 (async function() {
   TestRunner.addResult(
       `Tests that valid parsed script notifications are received by front-end.`);
-  await TestRunner.loadLegacyModule('sources'); await TestRunner.loadTestModule('sources_test_runner');
+  await TestRunner.loadLegacyModule('sources');
   await TestRunner.showPanel('sources');
   await TestRunner.navigatePromise('resources/debugger-scripts.html');