From b7c500fc6bf04e44156722cd053020595d1fbd35 Mon Sep 17 00:00:00 2001
From: Anna Gringauze <annagrin@google.com>
Date: Fri, 19 Aug 2022 11:14:43 -0700
Subject: [PATCH] Remove passing of --debugger-module-names flag to frontend
 server (#109791)

The flag is true by default so the behavior does not change.

Next steps:

Use the flag for updated debugger module names:
  - Frontend server: make the current behavior controlled
    by the flag non-conditional
  - Frontend server: add more debugging names changes under
    the same flag, false by default
  - Dwds: make changes required for the new module names.
  - Flutter tools: when matching dwds changes roll to flutter,
    pass the flag to the frontend server again.

- Cleanup:
  - Frontend server: make new behavior default
  - Flutter tools: remove uses of the flag.
  - Frontend server: remove the flag.

Towards: https://github.com/dart-lang/webdev/issues/1692
Helps: https://github.com/flutter/flutter/issues/106727
---
 packages/flutter_tools/lib/src/compile.dart                   | 4 ----
 .../flutter_tools/lib/src/isolated/resident_web_runner.dart   | 2 +-
 .../test/general.shard/compile_incremental_test.dart          | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/flutter_tools/lib/src/compile.dart b/packages/flutter_tools/lib/src/compile.dart
index d419b88a7d3..5483ee1e83b 100644
--- a/packages/flutter_tools/lib/src/compile.dart
+++ b/packages/flutter_tools/lib/src/compile.dart
@@ -753,10 +753,6 @@ class DefaultResidentCompiler implements ResidentCompiler {
       if (testCompilation)
         '--no-print-incremental-dependencies',
       '--target=$targetModel',
-      // TODO(zanderso): remove once this becomes the default behavior
-      // in the frontend_server.
-      // https://github.com/flutter/flutter/issues/52693
-      '--debugger-module-names',
       // TODO(annagrin): remove once this becomes the default behavior
       // in the frontend_server.
       // https://github.com/flutter/flutter/issues/59902
diff --git a/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart b/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart
index ac259be640d..602eb93d5d5 100644
--- a/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart
+++ b/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart
@@ -521,7 +521,7 @@ class ResidentWebRunner extends ResidentRunner {
       final Chromium chrome = await _chromiumLauncher!.connectedInstance;
       final ChromeTab chromeTab = await (chrome.chromeConnection.getTab((ChromeTab chromeTab) {
         return !chromeTab.url.startsWith('chrome-extension');
-      }) as FutureOr<ChromeTab>);
+      }, retryFor: const Duration(seconds: 5)) as FutureOr<ChromeTab>);
       if (chromeTab == null) {
         throwToolExit('Failed to connect to Chrome instance.');
       }
diff --git a/packages/flutter_tools/test/general.shard/compile_incremental_test.dart b/packages/flutter_tools/test/general.shard/compile_incremental_test.dart
index 52f1511dabb..8e20fe9eff6 100644
--- a/packages/flutter_tools/test/general.shard/compile_incremental_test.dart
+++ b/packages/flutter_tools/test/general.shard/compile_incremental_test.dart
@@ -36,7 +36,6 @@ void main() {
     'sdkroot/',
     '--incremental',
     '--target=flutter',
-    '--debugger-module-names',
     '--experimental-emit-debug-metadata',
     '--output-dill',
     '/build/',