Revert "Port devtools/service-workers/resources/user-agent-override-worker.js to a non-hosted e2e test"

This reverts commit a252a43.

Reason for revert: it looks like changes in the network helper cause
persistent failures for e2e (hosted) tests on Macs (arm64 and intel): https://ci.chromium.org/ui/p/devtools-frontend/builders/ci/Stand-alone%20Mac-arm64/7042/overview

Bug: 40733722
Original change's description:
> Port devtools/service-workers/resources/user-agent-override-worker.js to a non-hosted e2e test
>
> Bug: 40733722
> Change-Id: I419f7e63eecf90851da975fddeb0c012759d695d
> Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6589778
> Commit-Queue: Alex Rudenko <alexrudenko@chromium.org>
> Auto-Submit: Danil Somsikov <dsv@chromium.org>
> Reviewed-by: Alex Rudenko <alexrudenko@chromium.org>

Bug: 40733722
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: I11cbd9eab783b5273713368c1f6c3fd2dfb9a8f3
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6596984
Auto-Submit: Alex Rudenko <alexrudenko@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>

Author: OrKoN

test/e2e/helpers/network-helpers.ts

@@ -4,32 +4,31 @@
 
 import type * as puppeteer from 'puppeteer-core';
 
-import type {DevToolsPage} from '../../e2e_non_hosted/shared/frontend-helper.js';
 import {
   $,
+  $$,
   click,
+  getBrowserAndPages,
   goToResource,
   setCheckBox,
   typeText,
   waitFor,
+  waitForAria,
   waitForFunction,
 } from '../../shared/helper.js';
-import {getBrowserAndPagesWrappers} from '../../shared/non_hosted_wrappers.js';
 
 import {veImpression} from './visual-logging-helpers.js';
 
 const REQUEST_LIST_SELECTOR = '.network-log-grid tbody';
 
-export async function waitForNetworkTab(devToolsPage: DevToolsPage = getBrowserAndPagesWrappers().devToolsPage):
-    Promise<void> {
+export async function waitForNetworkTab(): Promise<void> {
   // Make sure the network tab is shown on the screen
-  await devToolsPage.waitFor('.network-log-grid');
+  await waitFor('.network-log-grid');
 }
 
-export async function openNetworkTab(devToolsPage: DevToolsPage = getBrowserAndPagesWrappers().devToolsPage):
-    Promise<void> {
-  await devToolsPage.click('#tab-network');
-  await waitForNetworkTab(devToolsPage);
+export async function openNetworkTab(): Promise<void> {
+  await click('#tab-network');
+  await waitForNetworkTab();
 }
 
 /**
@@ -45,17 +44,16 @@ export async function navigateToNetworkTab(testName: string) {
  * @param numberOfRequests The expected number of requests to wait for.
  * @param selector Optional. The selector to use to get the list of requests.
  */
-export async function waitForSomeRequestsToAppear(
-    numberOfRequests: number, devToolsPage: DevToolsPage = getBrowserAndPagesWrappers().devToolsPage) {
-  await devToolsPage.waitForFunction(async () => {
-    const requests = await getAllRequestNames(devToolsPage);
+export async function waitForSomeRequestsToAppear(numberOfRequests: number) {
+  await waitForFunction(async () => {
+    const requests = await getAllRequestNames();
     return requests.length >= numberOfRequests && Boolean(requests.map(name => name ? name.trim() : '').join(''));
   });
 }
 
-export async function getAllRequestNames(devToolsPage: DevToolsPage = getBrowserAndPagesWrappers().devToolsPage) {
-  const requests = await devToolsPage.$$(REQUEST_LIST_SELECTOR + ' .name-column');
-  return await Promise.all(requests.map(request => request.evaluate(r => r.deepInnerText().split('\n')[0])));
+export async function getAllRequestNames() {
+  const requests = await $$(REQUEST_LIST_SELECTOR + ' .name-column');
+  return await Promise.all(requests.map(request => request.evaluate(r => r.childNodes[2].textContent)));
 }
 
 export async function getNumberOfRequests() {
@@ -72,17 +70,31 @@ export async function getSelectedRequestName() {
   });
 }
 
-export async function selectRequestByName(
-    name: string, clickOptions?: puppeteer.ClickOptions,
-    devToolsPage: DevToolsPage = getBrowserAndPagesWrappers().devToolsPage) {
-  const requests = await devToolsPage.$$(REQUEST_LIST_SELECTOR + ' .name-column');
-  const names = await Promise.all(requests.map(request => request.evaluate(r => r.deepInnerText().split('\n')[0])));
-  const index = names.findIndex(n => n === name);
-  if (index === -1) {
-    assert.fail(`Request "${name}" not found.`);
+export async function selectRequestByName(name: string, clickOptions?: puppeteer.ClickOptions) {
+  const selector = REQUEST_LIST_SELECTOR + ' .name-column';
+  const {frontend} = getBrowserAndPages();
+
+  // Finding he click position is done in a single frontend.evaluate call
+  // to make sure the element still exists after finding the element.
+  // If this were done outside of evaluate code, it would be possible for an
+  // element to be removed from the dom between the $$(.selector) call and the
+  // click(element) call.
+  const rect = await frontend.evaluate((name, selector) => {
+    const elements = document.querySelectorAll(selector);
+    for (const element of elements) {
+      if (element.childNodes[2].textContent === name) {
+        const {left, top, width, height} = element.getBoundingClientRect();
+        return {left, top, width, height};
+      }
+    }
+    return null;
+  }, name, selector);
+
+  if (rect) {
+    const x = rect.left + rect.width * 0.5;
+    const y = rect.top + rect.height * 0.5;
+    await frontend.mouse.click(x, y, clickOptions);
   }
-  const request = requests[index];
-  await request.click(clickOptions);
 }
 
 export async function waitForSelectedRequestChange(initialRequestName: string|null) {
@@ -96,9 +108,8 @@ export async function setPersistLog(persist: boolean) {
   await setCheckBox('[title="Do not clear log on page reload / navigation"]', persist);
 }
 
-export async function setCacheDisabled(
-    disabled: boolean, devToolsPage: DevToolsPage = getBrowserAndPagesWrappers().devToolsPage): Promise<void> {
-  await devToolsPage.setCheckBox('[title^="Disable cache"]', disabled);
+export async function setCacheDisabled(disabled: boolean): Promise<void> {
+  await setCheckBox('[title^="Disable cache"]', disabled);
 }
 
 export async function setInvert(invert: boolean) {
@@ -115,12 +126,11 @@ export async function clearTimeWindow(): Promise<void> {
   await overviewGridCursorArea.click({count: 2});
 }
 
-export async function setTextFilter(
-    text: string, devToolsPage: DevToolsPage = getBrowserAndPagesWrappers().devToolsPage): Promise<void> {
-  const toolbarHandle = await devToolsPage.waitFor('.text-filter');
-  const input = await devToolsPage.waitForAria('Filter', toolbarHandle);
+export async function setTextFilter(text: string): Promise<void> {
+  const toolbarHandle = await waitFor('.text-filter');
+  const input = await waitForAria('Filter', toolbarHandle);
   await input.focus();
-  await typeText(text, devToolsPage);
+  await typeText(text);
 }
 
 export async function getTextFilterContent(): Promise<string> {

test/e2e_non_hosted/BUILD.gn

@@ -17,7 +17,6 @@ node_ts_library("tests") {
     "../conductor:implementation",
     "ai_assistance",
     "animations",
-    "application",
     "assertion",
     "console",
     "coverage",

test/e2e_non_hosted/application/BUILD.gn

@@ -43,12 +43,8 @@ export class StateProvider {
     } catch (e) {
       throw await screenshotError(state, e);
     } finally {
-      try {
-        await browsingContext.close();
-      } catch {
-      } finally {
-        dumpCollectedErrors();
-      }
+      await browsingContext.close();
+      dumpCollectedErrors();
     }
   }
 

test/e2e_non_hosted/application/user-agent-override_test.ts

@@ -86,8 +86,8 @@ export const doubleClick =
   return await devToolsPage.doubleClick(selector, options);
 };
 
-export const typeText =
-    async (text: string, devToolsPage: DevToolsPage = getBrowserAndPagesWrappers().devToolsPage) => {
+export const typeText = async (text: string) => {
+  const {devToolsPage} = getBrowserAndPagesWrappers();
   await devToolsPage.typeText(text);
 };
 
@@ -550,9 +550,8 @@ export async function renderCoordinatorQueueEmpty(): Promise<void> {
   await devToolsPage.renderCoordinatorQueueEmpty();
 }
 
-export async function setCheckBox(
-    selector: string, wantChecked: boolean,
-    devToolsPage: DevToolsPage = getBrowserAndPagesWrappers().devToolsPage): Promise<void> {
+export async function setCheckBox(selector: string, wantChecked: boolean): Promise<void> {
+  const {devToolsPage} = getBrowserAndPagesWrappers();
   await devToolsPage.setCheckBox(selector, wantChecked);
 }