Migrate and reeanble sourcemap_tests

Fixed: 327580855
Change-Id: I554c0174eacb920f831f4ddd562a7db4cec4db1b
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6596877
Auto-Submit: Philip Pfaffe <pfaffe@chromium.org>
Reviewed-by: Changhao Han <changhaohan@chromium.org>
Commit-Queue: Changhao Han <changhaohan@chromium.org>

Author: pfaffe

front_end/panels/network/NetworkDataGridNode.ts

@@ -1373,7 +1373,7 @@ export class NetworkRequestNode extends NetworkNode {
       case SDK.NetworkRequest.InitiatorType.SCRIPT: {
         const target = SDK.NetworkManager.NetworkManager.forRequest(request)?.target() || null;
         const linkifier = this.parentView().linkifier();
-        if (initiator.stack) {
+        if (initiator.stack?.callFrames.length) {
           this.linkifiedInitiatorAnchor = linkifier.linkifyStackTraceTopFrame(target, initiator.stack);
         } else {
           this.linkifiedInitiatorAnchor = linkifier.linkifyScriptLocation(

front_end/panels/sources/ResourceOriginPlugin.ts

@@ -67,7 +67,7 @@ export class ResourceOriginPlugin extends Plugin {
 
     // Handle anonymous scripts with an originStackTrace.
     for (const script of debuggerWorkspaceBinding.scriptsForUISourceCode(this.uiSourceCode)) {
-      if (script.originStackTrace) {
+      if (script.originStackTrace?.callFrames.length) {
         const link = linkifier.linkifyStackTraceTopFrame(script.debuggerModel.target(), script.originStackTrace);
         return [new UI.Toolbar.ToolbarItem(i18n.i18n.getFormatLocalizedString(str_, UIStrings.fromS, {PH1: link}))];
       }

front_end/ui/legacy/components/utils/Linkifier.ts

@@ -389,11 +389,9 @@ export class Linkifier extends Common.ObjectWrapper.ObjectWrapper<EventTypes> im
     // associated, whereas all active targets have one such pool. This ensures
     // that the fallbackAnchor is only ever used when the target was disposed.
     const pool = this.locationPoolByTarget.get(target);
-    if (!pool) {
-      console.assert(target.isDisposed());
+    if (!pool || target.isDisposed()) {
       return fallbackAnchor;
     }
-    console.assert(!target.isDisposed());
 
     // All targets that can report stack traces also have a debugger model.
     const debuggerModel = target.model(SDK.DebuggerModel.DebuggerModel) as SDK.DebuggerModel.DebuggerModel;

test/e2e/helpers/console-helpers.ts

@@ -225,8 +225,6 @@ export async function getStructuredConsoleMessages(devToolsPage?: DevToolsPage)
 export async function focusConsolePrompt(devToolsPage = getBrowserAndPagesWrappers().devToolsPage) {
   await devToolsPage.click(CONSOLE_PROMPT_SELECTOR);
   await devToolsPage.waitFor('[aria-label="Console prompt"]');
-  // FIXME(crbug/1112692): Refactor test to remove the timeout.
-  await devToolsPage.timeout(50);
 }
 
 export async function showVerboseMessages(devToolsPage = getBrowserAndPagesWrappers().devToolsPage) {

test/e2e/helpers/context-menu-helpers.ts

@@ -6,7 +6,7 @@ import {assert} from 'chai';
 import type * as puppeteer from 'puppeteer-core';
 
 import type {DevToolsPage} from '../../e2e_non_hosted/shared/frontend-helper.js';
-import {$, $$, click, waitForFunction} from '../../shared/helper.js';
+import {$, $$, waitForFunction} from '../../shared/helper.js';
 import {getBrowserAndPagesWrappers} from '../../shared/non_hosted_wrappers.js';
 
 export async function waitForSoftContextMenu(devToolsPage: DevToolsPage = getBrowserAndPagesWrappers().devToolsPage):
@@ -65,13 +65,14 @@ export async function assertSubMenuItemsText(subMenuText: string, expectedOption
   assert.deepEqual(subMenuItemsText, expectedOptions);
 }
 
-export async function openSoftContextMenuAndClickOnItem(selector: string, label: string) {
+export async function openSoftContextMenuAndClickOnItem(
+    selector: string, label: string, devToolsPage = getBrowserAndPagesWrappers().devToolsPage) {
   // Find the selected node, right click.
-  await click(selector, {clickOptions: {button: 'right'}});
+  await devToolsPage.click(selector, {clickOptions: {button: 'right'}});
 
   // Wait for the context menu option, and click it.
-  const root = await waitForSoftContextMenu();
-  await click(`[aria-label="${label}"]`, {root});
+  const root = await waitForSoftContextMenu(devToolsPage);
+  await devToolsPage.click(`[aria-label="${label}"]`, {root});
 }
 
 export async function openSubMenu(

test/e2e/helpers/elements-helpers.ts

@@ -711,7 +711,7 @@ export const getStyleRuleWithSourcePosition =
         return getStyleRule(styleSelector, devToolsPage);
       }
       const selector = getStyleRuleSelector(styleSelector);
-      return waitForFunction(async () => {
+      return devToolsPage.waitForFunction(async () => {
         const candidate = await devToolsPage.waitFor(selector);
         if (candidate) {
           const sourcePositionElement = await candidate.$('.styles-section-subtitle .devtools-link');

test/e2e/helpers/sources-helpers.ts

@@ -27,7 +27,6 @@ import {
   waitFor,
   waitForAria,
   waitForFunction,
-  waitForFunctionWithTries,
   waitForNone,
   waitForVisible,
 } from '../../shared/helper.js';
@@ -253,13 +252,14 @@ export async function addBreakpointForLine(
   await devToolsPage.waitForFunction(async () => await isBreakpointSet(index, devToolsPage));
 }
 
-export async function removeBreakpointForLine(index: number|string) {
-  const breakpointLine = await getLineNumberElement(index);
+export async function removeBreakpointForLine(
+    index: number|string, devToolsPage = getBrowserAndPagesWrappers().devToolsPage) {
+  const breakpointLine = await getLineNumberElement(index, devToolsPage);
   assertNotNullOrUndefined(breakpointLine);
 
-  await waitForFunction(async () => await isBreakpointSet(index));
-  await clickElement(breakpointLine);
-  await waitForFunction(async () => !(await isBreakpointSet(index)));
+  await devToolsPage.waitForFunction(async () => await isBreakpointSet(index, devToolsPage));
+  await devToolsPage.clickElement(breakpointLine);
+  await devToolsPage.waitForFunction(async () => !(await isBreakpointSet(index, devToolsPage)));
 }
 
 export async function addLogpointForLine(index: number, condition: string) {
@@ -335,9 +335,9 @@ export async function checkBreakpointDidNotActivate() {
 }
 
 export async function getBreakpointDecorators(
-    disabledOnly = false, devToolsPage: DevToolsPage = getBrowserAndPagesWrappers().devToolsPage) {
+    disabledOnly = false, expected = 0, devToolsPage: DevToolsPage = getBrowserAndPagesWrappers().devToolsPage) {
   const selector = `.cm-breakpoint${disabledOnly ? '-disabled' : ''}`;
-  const breakpointDecorators = await devToolsPage.$$(selector);
+  const breakpointDecorators = await devToolsPage.waitForMany(selector, expected);
   return await Promise.all(
       breakpointDecorators.map(breakpointDecorator => breakpointDecorator.evaluate(n => Number(n.textContent))));
 }
@@ -385,7 +385,8 @@ export async function switchToCallFrame(index: number) {
 }
 
 export async function retrieveTopCallFrameScriptLocation(
-    script: string, target: puppeteer.Page, devToolsPage: DevToolsPage = getBrowserAndPagesWrappers().devToolsPage) {
+    script: string, target: puppeteer.Page|InspectedPage,
+    devToolsPage: DevToolsPage = getBrowserAndPagesWrappers().devToolsPage) {
   // The script will run into a breakpoint, which means that it will not actually
   // finish the evaluation, until we continue executing.
   // Thus, we have to await it at a later point, while stepping through the code.
@@ -418,12 +419,12 @@ export async function retrieveTopCallFrameWithoutResuming(
   return scriptLocation;
 }
 
-export async function waitForStackTopMatch(matcher: RegExp) {
+export async function waitForStackTopMatch(matcher: RegExp, devToolsPage = getBrowserAndPagesWrappers().devToolsPage) {
   // The call stack is updated asynchronously, so let us wait until we see the correct one
   // (or report the last one we have seen before timeout).
   let stepLocation = '<no call stack>';
-  await waitForFunctionWithTries(async () => {
-    stepLocation = await retrieveTopCallFrameWithoutResuming() ?? '<invalid>';
+  await devToolsPage.waitForFunctionWithTries(async () => {
+    stepLocation = await retrieveTopCallFrameWithoutResuming(devToolsPage) ?? '<invalid>';
     return stepLocation?.match(matcher);
   }, {tries: 10});
   return stepLocation;

test/e2e/sources/BUILD.gn

@@ -22,7 +22,6 @@ node_ts_library("sources") {
     "overrides_test.ts",
     "restart-frame_test.ts",
     "snippets_test.ts",
-    "sourcemap_test.ts",
     "syntax-highlighting_test.ts",
     "watch-expressions_test.ts",
     "worker-relative-sourcemap_test.ts",