Revert "Read dart_plugin_registrant path from FlutterProject to support non-standard path." (#107850)

packages/flutter_tools/lib/src/compile.dart

@@ -328,7 +328,7 @@ class KernelCompiler {
         dartPluginRegistrant.path,
         '--source',
         'package:flutter/src/dart_plugin_registrant.dart',
-        '-Dflutter.dart_plugin_registrant=${toMultiRootPath(dartPluginRegistrant.uri, _fileSystemScheme, _fileSystemRoots, _fileSystem.path.separator == r'\')}',
+        '-Dflutter.dart_plugin_registrant=${dartPluginRegistrant.uri}',
       ],
       // See: https://github.com/flutter/flutter/issues/103994
       '--verbosity=error',
@@ -375,7 +375,7 @@ class _RecompileRequest extends _CompilationRequest {
     this.outputPath,
     this.packageConfig,
     this.suppressErrors,
-    {this.additionalSourceUri}
+    {this.additionalSource}
   );
 
   Uri mainUri;
@@ -383,7 +383,7 @@ class _RecompileRequest extends _CompilationRequest {
   String outputPath;
   PackageConfig packageConfig;
   bool suppressErrors;
-  final Uri? additionalSourceUri;
+  final String? additionalSource;
 
   @override
   Future<CompilerOutput?> _run(DefaultResidentCompiler compiler) async =>
@@ -499,7 +499,6 @@ abstract class ResidentCompiler {
     String? projectRootPath,
     bool suppressErrors = false,
     bool checkDartPluginRegistry = false,
-    File? dartPluginRegistrant,
   });
 
   Future<CompilerOutput?> compileExpression(
@@ -643,7 +642,6 @@ class DefaultResidentCompiler implements ResidentCompiler {
     required PackageConfig packageConfig,
     bool suppressErrors = false,
     bool checkDartPluginRegistry = false,
-    File? dartPluginRegistrant,
     String? projectRootPath,
     FileSystem? fs,
   }) async {
@@ -651,10 +649,20 @@ class DefaultResidentCompiler implements ResidentCompiler {
     if (!_controller.hasListener) {
       _controller.stream.listen(_handleCompilationRequest);
     }
-    Uri? additionalSourceUri;
+    String? additionalSource;
     // `dart_plugin_registrant.dart` contains the Dart plugin registry.
-    if (checkDartPluginRegistry && dartPluginRegistrant != null && dartPluginRegistrant.existsSync()) {
+    if (checkDartPluginRegistry && projectRootPath != null && fs != null) {
-      additionalSourceUri = dartPluginRegistrant.uri;
+      final File dartPluginRegistrantDart = fs.file(
+        fs.path.join(
+          projectRootPath,
+          '.dart_tool',
+          'flutter_build',
+          'dart_plugin_registrant.dart',
+        ),
+      );
+      if (dartPluginRegistrantDart != null && dartPluginRegistrantDart.existsSync()) {
+        additionalSource = dartPluginRegistrantDart.path;
+      }
     }
     final Completer<CompilerOutput?> completer = Completer<CompilerOutput?>();
     _controller.add(_RecompileRequest(
@@ -664,7 +672,7 @@ class DefaultResidentCompiler implements ResidentCompiler {
       outputPath,
       packageConfig,
       suppressErrors,
-      additionalSourceUri: additionalSourceUri,
+      additionalSource: additionalSource,
     ));
     return completer.future;
   }
@@ -677,15 +685,9 @@ class DefaultResidentCompiler implements ResidentCompiler {
     final String mainUri = request.packageConfig.toPackageUri(request.mainUri)?.toString() ??
       toMultiRootPath(request.mainUri, fileSystemScheme, fileSystemRoots, _platform.isWindows);
 
-    String? additionalSourceUri;
-    if (request.additionalSourceUri != null) {
-      additionalSourceUri = request.packageConfig.toPackageUri(request.additionalSourceUri!)?.toString() ??
-        toMultiRootPath(request.additionalSourceUri!, fileSystemScheme, fileSystemRoots, _platform.isWindows);
-    }
-
     final Process? server = _server;
     if (server == null) {
-      return _compile(mainUri, request.outputPath, additionalSourceUri: additionalSourceUri);
+      return _compile(mainUri, request.outputPath, additionalSource: request.additionalSource);
     }
     final String inputKey = Uuid().generateV4();
 
@@ -731,7 +733,7 @@ class DefaultResidentCompiler implements ResidentCompiler {
   Future<CompilerOutput?> _compile(
     String scriptUri,
     String? outputPath,
-    {String? additionalSourceUri}
+    {String? additionalSource}
   ) async {
     final String frontendServer = _artifacts.getArtifactPath(
       Artifact.frontendServerSnapshotForEngineDartSdk
@@ -784,12 +786,12 @@ class DefaultResidentCompiler implements ResidentCompiler {
         initializeFromDill!,
       ],
       if (assumeInitializeFromDillUpToDate) '--assume-initialize-from-dill-up-to-date',
-      if (additionalSourceUri != null) ...<String>[
+      if (additionalSource != null) ...<String>[
         '--source',
-        additionalSourceUri,
+        additionalSource,
         '--source',
         'package:flutter/src/dart_plugin_registrant.dart',
-        '-Dflutter.dart_plugin_registrant=$additionalSourceUri',
+        '-Dflutter.dart_plugin_registrant=${Uri.file(additionalSource)}',
       ],
       if (platformDill != null) ...<String>[
         '--platform',

packages/flutter_tools/lib/src/devfs.dart

@@ -581,7 +581,6 @@ class DevFS {
     bool bundleFirstUpload = false,
     bool fullRestart = false,
     String? projectRootPath,
-    File? dartPluginRegistrant,
   }) async {
     assert(trackWidgetCreation != null);
     assert(generator != null);
@@ -611,7 +610,6 @@ class DevFS {
       projectRootPath: projectRootPath,
       packageConfig: packageConfig,
       checkDartPluginRegistry: true, // The entry point is assumed not to have changed.
-      dartPluginRegistrant: dartPluginRegistrant,
     ).then((CompilerOutput? result) {
       compileTimer.stop();
       return result;

packages/flutter_tools/lib/src/isolated/devfs_web.dart

@@ -799,7 +799,6 @@ class WebDevFS implements DevFS {
     bool bundleFirstUpload = false,
     bool fullRestart = false,
     String? projectRootPath,
-    File? dartPluginRegistrant,
   }) async {
     assert(trackWidgetCreation != null);
     assert(generator != null);
@@ -867,7 +866,6 @@ class WebDevFS implements DevFS {
       packageConfig: packageConfig,
       projectRootPath: projectRootPath,
       fs: globals.fs,
-      dartPluginRegistrant: dartPluginRegistrant,
     );
     if (compilerOutput == null || compilerOutput.errorCount > 0) {
       return UpdateFSReport();

packages/flutter_tools/lib/src/resident_runner.dart

@@ -563,7 +563,6 @@ class FlutterDevice {
         invalidatedFiles: invalidatedFiles,
         packageConfig: packageConfig,
         devFSWriter: devFSWriter,
-        dartPluginRegistrant: FlutterProject.current().dartPluginRegistrant,
       );
     } on DevFSException {
       devFSStatus.cancel();

packages/flutter_tools/lib/src/run_hot.dart

@@ -373,7 +373,6 @@ class HotRunner extends ResidentRunner {
             // should only be displayed once.
             suppressErrors: applicationBinary == null,
             checkDartPluginRegistry: true,
-            dartPluginRegistrant: FlutterProject.current().dartPluginRegistrant,
             outputPath: dillOutputPath,
             packageConfig: debuggingOptions.buildInfo.packageConfig,
             projectRootPath: FlutterProject.current().directory.absolute.path,

packages/flutter_tools/test/general.shard/compile_incremental_test.dart

@@ -4,7 +4,6 @@
 
 import 'dart:async';
 
-import 'package:file/file.dart';
 import 'package:file/memory.dart';
 import 'package:flutter_tools/src/artifacts.dart';
 import 'package:flutter_tools/src/base/async_guard.dart';
@@ -395,43 +394,6 @@ void main() {
       'line2\nline3\n'
     ));
   });
-
-  testWithoutContext('incremental compile with dartPluginRegistrant', () async {
-    fakeProcessManager.addCommand(FakeCommand(
-      command: const <String>[
-        ...frontendServerCommand,
-        '--filesystem-root',
-        '/foo/bar/fizz',
-        '--filesystem-scheme',
-        'scheme',
-        '--source',
-        'some/dir/plugin_registrant.dart',
-        '--source',
-        'package:flutter/src/dart_plugin_registrant.dart',
-        '-Dflutter.dart_plugin_registrant=some/dir/plugin_registrant.dart',
-        '--verbosity=error',
-      ],
-      stdout: 'result abc\nline1\nline2\nabc\nabc /path/to/main.dart.dill 0',
-      stdin: frontendServerStdIn,
-    ));
-
-    final MemoryFileSystem fs = MemoryFileSystem();
-    final File dartPluginRegistrant = fs.file('some/dir/plugin_registrant.dart')..createSync(recursive: true);
-    final CompilerOutput? output = await generatorWithScheme.recompile(
-      Uri.parse('file:///foo/bar/fizz/main.dart'),
-        null /* invalidatedFiles */,
-      outputPath: '/build/',
-      packageConfig: PackageConfig.empty,
-      fs: fs,
-      projectRootPath: '',
-      checkDartPluginRegistry: true,
-      dartPluginRegistrant: dartPluginRegistrant,
-    );
-    expect(frontendServerStdIn.getAndClear(), 'compile scheme:///main.dart\n');
-    expect(testLogger.errorText, equals('line1\nline2\n'));
-    expect(output?.outputFilename, equals('/path/to/main.dart.dill'));
-    expect(fakeProcessManager, hasNoRemainingExpectations);
-  });
 }
 
 Future<void> _recompile(

packages/flutter_tools/test/general.shard/devfs_test.dart

@@ -581,7 +581,7 @@ class FakeResidentCompiler extends Fake implements ResidentCompiler {
   Future<CompilerOutput> Function(Uri mainUri, List<Uri>? invalidatedFiles)? onRecompile;
 
   @override
-  Future<CompilerOutput> recompile(Uri mainUri, List<Uri>? invalidatedFiles, {String? outputPath, PackageConfig? packageConfig, String? projectRootPath, FileSystem? fs, bool suppressErrors = false, bool checkDartPluginRegistry = false, File? dartPluginRegistrant}) {
+  Future<CompilerOutput> recompile(Uri mainUri, List<Uri>? invalidatedFiles, {String? outputPath, PackageConfig? packageConfig, String? projectRootPath, FileSystem? fs, bool suppressErrors = false, bool checkDartPluginRegistry = false}) {
     return onRecompile?.call(mainUri, invalidatedFiles)
       ?? Future<CompilerOutput>.value(const CompilerOutput('', 1, <Uri>[]));
   }

packages/flutter_tools/test/general.shard/resident_runner_test.dart

@@ -2464,7 +2464,6 @@ class FakeResidentCompiler extends Fake implements ResidentCompiler {
     @required FileSystem fs,
     bool suppressErrors = false,
     bool checkDartPluginRegistry = false,
-    File dartPluginRegistrant,
   }) async {
     didSuppressErrors = suppressErrors;
     return nextOutput ?? const CompilerOutput('foo.dill', 0, <Uri>[]);
@@ -2624,7 +2623,6 @@ class FakeDevFS extends Fake implements DevFS {
     bool bundleFirstUpload = false,
     bool fullRestart = false,
     String projectRootPath,
-    File dartPluginRegistrant,
   }) async {
     return nextUpdateReport;
   }

packages/flutter_tools/test/general.shard/resident_web_runner_test.dart

@@ -42,8 +42,7 @@ import '../src/common.dart';
 import '../src/context.dart';
 import '../src/fake_vm_services.dart';
 
-const List<VmServiceExpectation> kAttachLogExpectations =
+const List<VmServiceExpectation> kAttachLogExpectations = <VmServiceExpectation>[
-    <VmServiceExpectation>[
   FakeVmServiceRequest(
     method: 'streamListen',
     args: <String, Object>{
@@ -58,23 +57,34 @@ const List<VmServiceExpectation> kAttachLogExpectations =
   ),
 ];
 
-const List<VmServiceExpectation> kAttachIsolateExpectations =
+const List<VmServiceExpectation> kAttachIsolateExpectations = <VmServiceExpectation>[
-    <VmServiceExpectation>[
+  FakeVmServiceRequest(
-  FakeVmServiceRequest(method: 'streamListen', args: <String, Object>{
+    method: 'streamListen',
+    args: <String, Object>{
       'streamId': 'Isolate',
-  }),
+    }
-  FakeVmServiceRequest(method: 'registerService', args: <String, Object>{
+  ),
+  FakeVmServiceRequest(
+    method: 'registerService',
+    args: <String, Object>{
       'service': 'reloadSources',
       'alias': 'Flutter Tools',
-  }),
+    }
-  FakeVmServiceRequest(method: 'registerService', args: <String, Object>{
+  ),
+  FakeVmServiceRequest(
+    method: 'registerService',
+    args: <String, Object>{
       'service': 'flutterVersion',
       'alias': 'Flutter Tools',
-  }),
+    }
-  FakeVmServiceRequest(method: 'registerService', args: <String, Object>{
+  ),
+  FakeVmServiceRequest(
+    method: 'registerService',
+    args: <String, Object>{
       'service': 'flutterMemoryInfo',
       'alias': 'Flutter Tools',
-  }),
+    }
+  ),
   FakeVmServiceRequest(
     method: 'streamListen',
     args: <String, Object>{
@@ -138,9 +148,7 @@ void main() {
     chromeConnection.tabs.add(chromeTab);
   }
 
-  testUsingContext(
+  testUsingContext('runner with web server device does not support debugging without --start-paused', () {
-      'runner with web server device does not support debugging without --start-paused',
-      () {
     final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice);
     flutterDevice.device = WebServerDevice(
       logger: BufferLogger.test(),
@@ -148,8 +156,7 @@ void main() {
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[]);
     final ResidentRunner profileResidentWebRunner = ResidentWebRunner(
       flutterDevice,
-      flutterProject:
+      flutterProject: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
-          FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
       debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
       ipv6: true,
       fileSystem: fileSystem,
@@ -169,9 +176,7 @@ void main() {
     ProcessManager: () => processManager,
   });
 
-  testUsingContext(
+  testUsingContext('runner with web server device supports debugging with --start-paused', () {
-      'runner with web server device supports debugging with --start-paused',
-      () {
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[]);
     setupMocks();
     flutterDevice.device = WebServerDevice(
@@ -179,10 +184,8 @@ void main() {
     );
     final ResidentRunner profileResidentWebRunner = ResidentWebRunner(
       flutterDevice,
-      flutterProject:
+      flutterProject: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
-          FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
+      debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug, startPaused: true),
-      debuggingOptions:
-          DebuggingOptions.enabled(BuildInfo.debug, startPaused: true),
       ipv6: true,
       fileSystem: fileSystem,
       logger: BufferLogger.test(),
@@ -199,8 +202,7 @@ void main() {
   testUsingContext('profile does not supportsServiceProtocol', () {
     final ResidentRunner residentWebRunner = ResidentWebRunner(
       flutterDevice,
-      flutterProject:
+      flutterProject: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
-          FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
       debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
       ipv6: true,
       fileSystem: fileSystem,
@@ -212,8 +214,7 @@ void main() {
     flutterDevice.device = chromeDevice;
     final ResidentRunner profileResidentWebRunner = ResidentWebRunner(
       flutterDevice,
-      flutterProject:
+      flutterProject: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
-          FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
       debuggingOptions: DebuggingOptions.enabled(BuildInfo.profile),
       ipv6: true,
       fileSystem: fileSystem,
@@ -231,98 +232,69 @@ void main() {
 
   testUsingContext('Can successfully run and connect to vmservice', () async {
     final BufferLogger logger = BufferLogger.test();
-    final ResidentRunner residentWebRunner =
+    final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice, logger: logger);
-        setUpResidentRunner(flutterDevice, logger: logger);
+    fakeVmServiceHost = FakeVmServiceHost(requests: kAttachExpectations.toList());
-    fakeVmServiceHost =
-        FakeVmServiceHost(requests: kAttachExpectations.toList());
     setupMocks();
 
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
     unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
-    final DebugConnectionInfo debugConnectionInfo =
+    final DebugConnectionInfo debugConnectionInfo = await connectionInfoCompleter.future;
-        await connectionInfoCompleter.future;
 
     expect(appConnection.ranMain, true);
-    expect(logger.statusText,
+    expect(logger.statusText, contains('Debug service listening on ws://127.0.0.1/abcd/'));
-        contains('Debug service listening on ws://127.0.0.1/abcd/'));
     expect(debugConnectionInfo.wsUri.toString(), 'ws://127.0.0.1/abcd/');
   }, overrides: <Type, Generator>{
     FileSystem: () => fileSystem,
     ProcessManager: () => processManager,
   });
 
-  testUsingContext('WebRunner copies compiled app.dill to cache during startup',
+  testUsingContext('WebRunner copies compiled app.dill to cache during startup', () async {
-      () async {
     final DebuggingOptions debuggingOptions = DebuggingOptions.enabled(
       const BuildInfo(BuildMode.debug, null, treeShakeIcons: false),
     );
-    final ResidentRunner residentWebRunner =
+    final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice, debuggingOptions: debuggingOptions);
-        setUpResidentRunner(flutterDevice, debuggingOptions: debuggingOptions);
+    fakeVmServiceHost = FakeVmServiceHost(requests: kAttachExpectations.toList());
-    fakeVmServiceHost =
-        FakeVmServiceHost(requests: kAttachExpectations.toList());
     setupMocks();
 
-    residentWebRunner.artifactDirectory
+    residentWebRunner.artifactDirectory.childFile('app.dill').writeAsStringSync('ABC');
-        .childFile('app.dill')
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        .writeAsStringSync('ABC');
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
-        Completer<DebugConnectionInfo>();
     unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
 
-    expect(
+    expect(await fileSystem.file(fileSystem.path.join('build', 'cache.dill')).readAsString(), 'ABC');
-        await fileSystem
-            .file(fileSystem.path.join('build', 'cache.dill'))
-            .readAsString(),
-        'ABC');
   }, overrides: <Type, Generator>{
     FileSystem: () => fileSystem,
     ProcessManager: () => processManager,
   });
 
-  testUsingContext(
+  testUsingContext('WebRunner copies compiled app.dill to cache during startup with track-widget-creation', () async {
-      'WebRunner copies compiled app.dill to cache during startup with track-widget-creation',
-      () async {
     final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice);
-    fakeVmServiceHost =
+    fakeVmServiceHost = FakeVmServiceHost(requests: kAttachExpectations.toList());
-        FakeVmServiceHost(requests: kAttachExpectations.toList());
     setupMocks();
 
-    residentWebRunner.artifactDirectory
+    residentWebRunner.artifactDirectory.childFile('app.dill').writeAsStringSync('ABC');
-        .childFile('app.dill')
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        .writeAsStringSync('ABC');
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
-        Completer<DebugConnectionInfo>();
     unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
 
-    expect(
+    expect(await fileSystem.file(fileSystem.path.join('build', 'cache.dill.track.dill')).readAsString(), 'ABC');
-        await fileSystem
-            .file(fileSystem.path.join('build', 'cache.dill.track.dill'))
-            .readAsString(),
-        'ABC');
   }, overrides: <Type, Generator>{
     FileSystem: () => fileSystem,
     ProcessManager: () => processManager,
   });
 
   // Regression test for https://github.com/flutter/flutter/issues/60613
-  testUsingContext(
+  testUsingContext('ResidentWebRunner calls appFailedToStart if initial compilation fails', () async {
-      'ResidentWebRunner calls appFailedToStart if initial compilation fails',
+    fakeVmServiceHost = FakeVmServiceHost(requests: kAttachExpectations.toList());
-      () async {
-    fakeVmServiceHost =
-        FakeVmServiceHost(requests: kAttachExpectations.toList());
     setupMocks();
     final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice);
-    fileSystem
+    fileSystem.file(globals.fs.path.join('lib', 'main.dart'))
-        .file(globals.fs.path.join('lib', 'main.dart'))
       .createSync(recursive: true);
     webDevFS.report = UpdateFSReport();
 
@@ -334,18 +306,15 @@ void main() {
     ProcessManager: () => processManager,
   });
 
-  testUsingContext(
+  testUsingContext('Can successfully run without an index.html including status warning', () async {
-      'Can successfully run without an index.html including status warning',
-      () async {
     final BufferLogger logger = BufferLogger.test();
-    fakeVmServiceHost =
+    fakeVmServiceHost = FakeVmServiceHost(requests: kAttachExpectations.toList());
-        FakeVmServiceHost(requests: kAttachExpectations.toList());
     setupMocks();
-    fileSystem.file(fileSystem.path.join('web', 'index.html')).deleteSync();
+    fileSystem.file(fileSystem.path.join('web', 'index.html'))
+      .deleteSync();
     final ResidentWebRunner residentWebRunner = ResidentWebRunner(
       flutterDevice,
-      flutterProject:
+      flutterProject: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
-          FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
       debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
       ipv6: true,
       stayResident: false,
@@ -363,15 +332,12 @@ void main() {
     ProcessManager: () => processManager,
   });
 
-  testUsingContext('Can successfully run and disconnect with --no-resident',
+  testUsingContext('Can successfully run and disconnect with --no-resident', () async {
-      () async {
+    fakeVmServiceHost = FakeVmServiceHost(requests: kAttachExpectations.toList());
-    fakeVmServiceHost =
-        FakeVmServiceHost(requests: kAttachExpectations.toList());
     setupMocks();
     final ResidentRunner residentWebRunner = ResidentWebRunner(
       flutterDevice,
-      flutterProject:
+      flutterProject: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
-          FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
       debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
       ipv6: true,
       stayResident: false,
@@ -387,11 +353,9 @@ void main() {
     ProcessManager: () => processManager,
   });
 
-  testUsingContext('Listens to stdout and stderr streams before running main',
+  testUsingContext('Listens to stdout and stderr streams before running main', () async {
-      () async {
     final BufferLogger logger = BufferLogger.test();
-    final ResidentRunner residentWebRunner =
+    final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice, logger: logger);
-        setUpResidentRunner(flutterDevice, logger: logger);
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachLogExpectations,
       FakeVmServiceStreamResponse(
@@ -399,20 +363,21 @@ void main() {
         event: vm_service.Event(
           timestamp: 0,
           kind: vm_service.EventStreams.kStdout,
-            bytes: base64.encode(utf8.encode('THIS MESSAGE IS IMPORTANT'))),
+          bytes: base64.encode(utf8.encode('THIS MESSAGE IS IMPORTANT'))
+        ),
       ),
       FakeVmServiceStreamResponse(
         streamId: 'Stderr',
         event: vm_service.Event(
           timestamp: 0,
           kind: vm_service.EventStreams.kStderr,
-            bytes: base64.encode(utf8.encode('SO IS THIS'))),
+          bytes: base64.encode(utf8.encode('SO IS THIS'))
+        ),
       ),
       ...kAttachIsolateExpectations,
     ]);
     setupMocks();
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
     unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
@@ -425,10 +390,8 @@ void main() {
     ProcessManager: () => processManager,
   });
 
-  testUsingContext('Listens to extension events with structured errors',
+  testUsingContext('Listens to extension events with structured errors', () async {
-      () async {
+    final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice, logger: testLogger);
-    final ResidentRunner residentWebRunner =
-        setUpResidentRunner(flutterDevice, logger: testLogger);
     final Map<String, String> extensionData = <String, String>{
       'test': 'data',
       'renderedErrorText': 'error text',
@@ -474,8 +437,7 @@ void main() {
     ]);
 
     setupMocks();
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
     unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
@@ -492,21 +454,17 @@ void main() {
   testUsingContext('Does not run main with --start-paused', () async {
     final ResidentRunner residentWebRunner = ResidentWebRunner(
       flutterDevice,
-      flutterProject:
+      flutterProject: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
-          FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
+      debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug, startPaused: true),
-      debuggingOptions:
-          DebuggingOptions.enabled(BuildInfo.debug, startPaused: true),
       ipv6: true,
       fileSystem: fileSystem,
       logger: BufferLogger.test(),
       usage: globals.flutterUsage,
       systemClock: globals.systemClock,
     );
-    fakeVmServiceHost =
+    fakeVmServiceHost = FakeVmServiceHost(requests: kAttachExpectations.toList());
-        FakeVmServiceHost(requests: kAttachExpectations.toList());
     setupMocks();
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
 
     unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
@@ -532,7 +490,8 @@ void main() {
         method: 'hotRestart',
         jsonResponse: <String, Object>{
           'type': 'Success',
-          }),
+        }
+      ),
       const FakeVmServiceRequest(
         method: 'streamListen',
         args: <String, Object>{
@@ -542,8 +501,7 @@ void main() {
     ]);
     setupMocks();
     final TestChromiumLauncher chromiumLauncher = TestChromiumLauncher();
-    final Chromium chrome =
+    final Chromium chrome = Chromium(1, chromeConnection, chromiumLauncher: chromiumLauncher);
-        Chromium(1, chromeConnection, chromiumLauncher: chromiumLauncher);
     chromiumLauncher.setInstance(chrome);
 
     flutterDevice.device = GoogleChromeDevice(
@@ -555,13 +513,11 @@ void main() {
     );
     webDevFS.report = UpdateFSReport(success: true);
 
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
     unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
-    final DebugConnectionInfo debugConnectionInfo =
+    final DebugConnectionInfo debugConnectionInfo = await connectionInfoCompleter.future;
-        await connectionInfoCompleter.future;
 
     expect(debugConnectionInfo, isNotNull);
 
@@ -573,15 +529,7 @@ void main() {
 
     // ensure that analytics are sent.
     expect(testUsage.events, <TestUsageEvent>[
-      TestUsageEvent('hot', 'restart',
+      TestUsageEvent('hot', 'restart', parameters: CustomDimensions.fromMap(<String, String>{'cd27': 'web-javascript', 'cd28': '', 'cd29': 'false', 'cd30': 'true', 'cd13': '0', 'cd48': 'false'})),
-          parameters: CustomDimensions.fromMap(<String, String>{
-            'cd27': 'web-javascript',
-            'cd28': '',
-            'cd29': 'false',
-            'cd30': 'true',
-            'cd13': '0',
-            'cd48': 'false'
-          })),
     ]);
     expect(testUsage.timings, const <TestTimingEvent>[
       TestTimingEvent('hot', 'web-incremental-restart', Duration.zero),
@@ -605,12 +553,12 @@ void main() {
         method: 'hotRestart',
         jsonResponse: <String, Object>{
           'type': 'Success',
-          }),
+        }
+      ),
     ]);
     setupMocks();
     final TestChromiumLauncher chromiumLauncher = TestChromiumLauncher();
-    final Chromium chrome =
+    final Chromium chrome = Chromium(1, chromeConnection, chromiumLauncher: chromiumLauncher);
-        Chromium(1, chromeConnection, chromiumLauncher: chromiumLauncher);
     chromiumLauncher.setInstance(chrome);
 
     flutterDevice.device = GoogleChromeDevice(
@@ -622,19 +570,16 @@ void main() {
     );
     webDevFS.report = UpdateFSReport(success: true);
 
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
     unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
-    final OperationResult result =
+    final OperationResult result = await residentWebRunner.restart(fullRestart: true);
-        await residentWebRunner.restart(fullRestart: true);
 
     // Ensure that generated entrypoint is generated correctly.
     expect(webDevFS.mainUri, isNotNull);
-    final String entrypointContents =
+    final String entrypointContents = fileSystem.file(webDevFS.mainUri).readAsStringSync();
-        fileSystem.file(webDevFS.mainUri).readAsStringSync();
     expect(entrypointContents, contains('// Flutter web bootstrap script'));
     expect(entrypointContents, contains("import 'dart:ui' as ui;"));
     expect(entrypointContents, contains('await ui.webOnlyWarmupEngine('));
@@ -644,15 +589,7 @@ void main() {
 
 	  // ensure that analytics are sent.
     expect(testUsage.events, <TestUsageEvent>[
-      TestUsageEvent('hot', 'restart',
+      TestUsageEvent('hot', 'restart', parameters: CustomDimensions.fromMap(<String, String>{'cd27': 'web-javascript', 'cd28': '', 'cd29': 'false', 'cd30': 'true', 'cd13': '0', 'cd48': 'false'})),
-          parameters: CustomDimensions.fromMap(<String, String>{
-            'cd27': 'web-javascript',
-            'cd28': '',
-            'cd29': 'false',
-            'cd30': 'true',
-            'cd13': '0',
-            'cd48': 'false'
-          })),
     ]);
     expect(testUsage.timings, const <TestTimingEvent>[
       TestTimingEvent('hot', 'web-incremental-restart', Duration.zero),
@@ -663,8 +600,7 @@ void main() {
     ProcessManager: () => processManager,
   });
 
-  testUsingContext('Can hot restart after attaching with web-server device',
+  testUsingContext('Can hot restart after attaching with web-server device', () async {
-      () async {
     final BufferLogger logger = BufferLogger.test();
     final ResidentRunner residentWebRunner = setUpResidentRunner(
       flutterDevice,
@@ -676,14 +612,12 @@ void main() {
     flutterDevice.device = webServerDevice;
     webDevFS.report = UpdateFSReport(success: true);
 
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
     unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
-    final OperationResult result =
+    final OperationResult result = await residentWebRunner.restart(fullRestart: true);
-        await residentWebRunner.restart(fullRestart: true);
 
     expect(logger.statusText, contains('Restarted application in'));
     expect(result.code, 0);
@@ -699,8 +633,7 @@ void main() {
 
   testUsingContext('web resident runner is debuggable', () {
     final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice);
-    fakeVmServiceHost =
+    fakeVmServiceHost = FakeVmServiceHost(requests: kAttachExpectations.toList());
-        FakeVmServiceHost(requests: kAttachExpectations.toList());
 
     expect(residentWebRunner.debuggingEnabled, true);
   }, overrides: <Type, Generator>{
@@ -714,8 +647,7 @@ void main() {
     setupMocks();
     webDevFS.report = UpdateFSReport();
 
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
     unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
@@ -729,12 +661,9 @@ void main() {
     ProcessManager: () => processManager,
   });
 
-  testUsingContext(
+  testUsingContext('Faithfully displays stdout messages with leading/trailing spaces', () async {
-      'Faithfully displays stdout messages with leading/trailing spaces',
-      () async {
     final BufferLogger logger = BufferLogger.test();
-    final ResidentRunner residentWebRunner =
+    final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice, logger: logger);
-        setUpResidentRunner(flutterDevice, logger: logger);
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachLogExpectations,
       FakeVmServiceStreamResponse(
@@ -743,25 +672,21 @@ void main() {
           timestamp: 0,
           kind: vm_service.EventStreams.kStdout,
           bytes: base64.encode(
-            utf8.encode(
+            utf8.encode('    This is a message with 4 leading and trailing spaces    '),
-                '    This is a message with 4 leading and trailing spaces    '),
           ),
         ),
       ),
       ...kAttachIsolateExpectations,
     ]);
     setupMocks();
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
     unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
 
-    expect(
+    expect(logger.statusText,
-        logger.statusText,
+      contains('    This is a message with 4 leading and trailing spaces    '));
-        contains(
-            '    This is a message with 4 leading and trailing spaces    '));
     expect(fakeVmServiceHost.hasRemainingExpectations, false);
   }, overrides: <Type, Generator>{
     FileSystem: () => fileSystem,
@@ -770,19 +695,16 @@ void main() {
 
   testUsingContext('Fails on compilation errors in hot restart', () async {
     final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice);
-    fakeVmServiceHost =
+    fakeVmServiceHost = FakeVmServiceHost(requests: kAttachExpectations.toList());
-        FakeVmServiceHost(requests: kAttachExpectations.toList());
     setupMocks();
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
     unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
     webDevFS.report = UpdateFSReport();
 
-    final OperationResult result =
+    final OperationResult result = await residentWebRunner.restart(fullRestart: true);
-        await residentWebRunner.restart(fullRestart: true);
 
     expect(result.code, 1);
     expect(result.message, contains('Failed to recompile application.'));
@@ -794,9 +716,7 @@ void main() {
     ProcessManager: () => processManager,
   });
 
-  testUsingContext(
+  testUsingContext('Fails non-fatally on vmservice response error for hot restart', () async {
-      'Fails non-fatally on vmservice response error for hot restart',
-      () async {
     final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice);
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachExpectations,
@@ -808,8 +728,7 @@ void main() {
       ),
     ]);
     setupMocks();
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
     unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
@@ -834,8 +753,7 @@ void main() {
       ),
     ]);
     setupMocks();
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
     unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
@@ -843,17 +761,16 @@ void main() {
     final OperationResult result = await residentWebRunner.restart();
 
     expect(result.code, 1);
-    expect(result.message, contains(RPCErrorCodes.kInternalError.toString()));
+    expect(result.message,
+      contains(RPCErrorCodes.kInternalError.toString()));
   }, overrides: <Type, Generator>{
     FileSystem: () => fileSystem,
     ProcessManager: () => processManager,
   });
 
-  testUsingContext('printHelp without details shows hot restart help message',
+  testUsingContext('printHelp without details shows hot restart help message', () async {
-      () async {
     final BufferLogger logger = BufferLogger.test();
-    final ResidentRunner residentWebRunner =
+    final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice, logger: logger);
-        setUpResidentRunner(flutterDevice, logger: logger);
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[]);
     residentWebRunner.printHelp(details: false);
 
@@ -863,16 +780,14 @@ void main() {
     ProcessManager: () => processManager,
   });
 
-  testUsingContext('cleanup of resources is safe to call multiple times',
+  testUsingContext('cleanup of resources is safe to call multiple times', () async {
-      () async {
     final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice);
     mockDevice.dds = DartDevelopmentService();
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachExpectations,
     ]);
     setupMocks();
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
     unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
@@ -894,8 +809,7 @@ void main() {
       ...kAttachExpectations,
     ]);
     setupMocks();
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
     final Future<int> result = residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     );
@@ -911,23 +825,19 @@ void main() {
 
   testUsingContext('Prints target and device name on run', () async {
     final BufferLogger logger = BufferLogger.test();
-    final ResidentRunner residentWebRunner =
+    final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice, logger: logger);
-        setUpResidentRunner(flutterDevice, logger: logger);
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachExpectations,
     ]);
     setupMocks();
     mockDevice.name = 'Chromez';
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
     unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
 
-    expect(
+    expect(logger.statusText, contains(
-        logger.statusText,
-        contains(
       'Launching ${fileSystem.path.join('lib', 'main.dart')} on '
       'Chromez in debug mode',
     ));
@@ -937,8 +847,7 @@ void main() {
     ProcessManager: () => processManager,
   });
 
-  testUsingContext('Sends launched app.webLaunchUrl event for Chrome device',
+  testUsingContext('Sends launched app.webLaunchUrl event for Chrome device', () async {
-      () async {
     final BufferLogger logger = BufferLogger.test();
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachLogExpectations,
@@ -947,8 +856,7 @@ void main() {
     setupMocks();
     final FakeChromeConnection chromeConnection = FakeChromeConnection();
     final TestChromiumLauncher chromiumLauncher = TestChromiumLauncher();
-    final Chromium chrome =
+    final Chromium chrome = Chromium(1, chromeConnection, chromiumLauncher: chromiumLauncher);
-        Chromium(1, chromeConnection, chromiumLauncher: chromiumLauncher);
     chromiumLauncher.setInstance(chrome);
 
     flutterDevice.device = GoogleChromeDevice(
@@ -965,8 +873,7 @@ void main() {
 
     final ResidentWebRunner runner = ResidentWebRunner(
       flutterDevice,
-      flutterProject:
+      flutterProject: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
-          FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
       debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
       ipv6: true,
       fileSystem: fileSystem,
@@ -975,18 +882,15 @@ void main() {
       systemClock: globals.systemClock,
     );
 
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
     unawaited(runner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
 
     // Ensure we got the URL and that it was already launched.
-    expect(
+    expect(logger.eventText,
-        logger.eventText,
+      contains(json.encode(<String, Object>{
-        contains(json.encode(
-          <String, Object>{
         'name': 'app.webLaunchUrl',
         'args': <String, Object>{
           'url': 'http://localhost:8765/app/',
@@ -1000,9 +904,7 @@ void main() {
     ProcessManager: () => processManager,
   });
 
-  testUsingContext(
+  testUsingContext('Sends unlaunched app.webLaunchUrl event for Web Server device', () async {
-      'Sends unlaunched app.webLaunchUrl event for Web Server device',
-      () async {
     final BufferLogger logger = BufferLogger.test();
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[]);
     setupMocks();
@@ -1013,8 +915,7 @@ void main() {
 
     final ResidentWebRunner runner = ResidentWebRunner(
       flutterDevice,
-      flutterProject:
+      flutterProject: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
-          FlutterProject.fromDirectoryTest(fileSystem.currentDirectory),
       debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
       ipv6: true,
       fileSystem: fileSystem,
@@ -1023,18 +924,15 @@ void main() {
       systemClock: globals.systemClock,
     );
 
-    final Completer<DebugConnectionInfo> connectionInfoCompleter =
+    final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-        Completer<DebugConnectionInfo>();
     unawaited(runner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
 
     // Ensure we got the URL and that it was not already launched.
-    expect(
+    expect(logger.eventText,
-        logger.eventText,
+      contains(json.encode(<String, Object>{
-        contains(json.encode(
-          <String, Object>{
         'name': 'app.webLaunchUrl',
         'args': <String, Object>{
           'url': 'http://localhost:8765/app/',
@@ -1052,8 +950,8 @@ void main() {
   // perf regression in hot restart.
   testUsingContext('Does not generate dart_plugin_registrant.dart', () async {
     // Create necessary files for [DartPluginRegistrantTarget]
-    final File packageConfig =
+    final File packageConfig = globals.fs.directory('.dart_tool')
-        globals.fs.directory('.dart_tool').childFile('package_config.json');
+        .childFile('package_config.json');
     packageConfig.createSync(recursive: true);
     packageConfig.writeAsStringSync('''
 {
@@ -1069,14 +967,12 @@ void main() {
 }
 ''');
     // Start with a dart_plugin_registrant.dart file.
-    globals.fs
+    globals.fs.directory('.dart_tool')
-        .directory('.dart_tool')
               .childDirectory('flutter_build')
               .childFile('dart_plugin_registrant.dart')
               .createSync(recursive: true);
 
-    final FlutterProject project =
+    final FlutterProject project = FlutterProject.fromDirectoryTest(fileSystem.currentDirectory);
-        FlutterProject.fromDirectoryTest(fileSystem.currentDirectory);
 
     final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice);
     await residentWebRunner.runSourceGenerators();
@@ -1091,11 +987,9 @@ void main() {
     ProcessManager: () => processManager,
   });
 
-  testUsingContext('Successfully turns WebSocketException into ToolExit',
+  testUsingContext('Successfully turns WebSocketException into ToolExit', () async {
-      () async {
     final BufferLogger logger = BufferLogger.test();
-    final ResidentRunner residentWebRunner =
+    final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice, logger: logger);
-        setUpResidentRunner(flutterDevice, logger: logger);
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[]);
     setupMocks();
     webDevFS.exception = const WebSocketException();
@@ -1108,8 +1002,7 @@ void main() {
     ProcessManager: () => processManager,
   });
 
-  testUsingContext('Successfully turns AppConnectionException into ToolExit',
+  testUsingContext('Successfully turns AppConnectionException into ToolExit', () async {
-      () async {
     final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice);
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[]);
     setupMocks();
@@ -1122,8 +1015,7 @@ void main() {
     ProcessManager: () => processManager,
   });
 
-  testUsingContext('Successfully turns ChromeDebugError into ToolExit',
+  testUsingContext('Successfully turns ChromeDebugError into ToolExit', () async {
-      () async {
     final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice);
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[]);
     setupMocks();
@@ -1152,8 +1044,7 @@ void main() {
 
   testUsingContext('Rethrows unknown Error type from dwds tooling', () async {
     final BufferLogger logger = BufferLogger.test();
-    final ResidentRunner residentWebRunner =
+    final ResidentRunner residentWebRunner = setUpResidentRunner(flutterDevice, logger: logger);
-        setUpResidentRunner(flutterDevice, logger: logger);
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[]);
     setupMocks();
     webDevFS.exception = StateError('');
@@ -1166,18 +1057,15 @@ void main() {
   });
 }
 
-ResidentRunner setUpResidentRunner(
+ResidentRunner setUpResidentRunner(FlutterDevice flutterDevice, {
-  FlutterDevice flutterDevice, {
   Logger logger,
   SystemClock systemClock,
   DebuggingOptions debuggingOptions,
 }) {
   return ResidentWebRunner(
     flutterDevice,
-    flutterProject:
+    flutterProject: FlutterProject.fromDirectoryTest(globals.fs.currentDirectory),
-        FlutterProject.fromDirectoryTest(globals.fs.currentDirectory),
+    debuggingOptions: debuggingOptions ?? DebuggingOptions.enabled(BuildInfo.debug),
-    debuggingOptions:
-        debuggingOptions ?? DebuggingOptions.enabled(BuildInfo.debug),
     ipv6: true,
     usage: globals.flutterUsage,
     systemClock: systemClock ?? SystemClock.fixed(DateTime.now()),
@@ -1238,8 +1126,7 @@ class FakeDebugConnection extends Fake implements DebugConnection {
   FakeVmServiceHost Function() fakeVmServiceHost;
 
   @override
-  vm_service.VmService get vmService =>
+  vm_service.VmService get vmService => fakeVmServiceHost.call().vmService.service;
-      fakeVmServiceHost.call().vmService.service;
 
   @override
   String uri;
@@ -1283,7 +1170,6 @@ class FakeResidentCompiler extends Fake implements ResidentCompiler {
     @required FileSystem fs,
     bool suppressErrors = false,
     bool checkDartPluginRegistry = false,
-    File dartPluginRegistrant,
   }) async {
     return const CompilerOutput('foo.dill', 0, <Uri>[]);
   }
@@ -1343,7 +1229,6 @@ class FakeWebDevFS extends Fake implements WebDevFS {
     bool bundleFirstUpload = false,
     bool fullRestart = false,
     String projectRootPath,
-    File dartPluginRegistrant,
   }) async {
     this.mainUri = mainUri;
     return report;
@@ -1364,8 +1249,7 @@ class FakeChromeConnection extends Fake implements ChromeConnection {
   final List<ChromeTab> tabs = <ChromeTab>[];
 
   @override
-  Future<ChromeTab> getTab(bool Function(ChromeTab tab) accept,
+  Future<ChromeTab> getTab(bool Function(ChromeTab tab) accept, {Duration retryFor}) async {
-      {Duration retryFor}) async {
     return tabs.firstWhere(accept);
   }
 
@@ -1480,8 +1364,7 @@ class FakeFlutterDevice extends Fake implements FlutterDevice {
   }
 
   @override
-  Future<void> exitApps(
+  Future<void> exitApps({Duration timeoutDelay = const Duration(seconds: 10)}) async { }
-      {Duration timeoutDelay = const Duration(seconds: 10)}) async {}
 
   @override
   Future<void> connect({
@@ -1513,7 +1396,6 @@ class FakeFlutterDevice extends Fake implements FlutterDevice {
     String dillOutputPath,
     List<Uri> invalidatedFiles,
     PackageConfig packageConfig,
-    File dartPluginRegistrant,
   }) async {
     if (reportError != null) {
       throw reportError;

packages/flutter_tools/test/general.shard/test/test_compiler_test.dart

@@ -200,7 +200,6 @@ class FakeResidentCompiler extends Fake implements ResidentCompiler {
     FileSystem? fs,
     bool suppressErrors = false,
     bool checkDartPluginRegistry = false,
-    File? dartPluginRegistrant,
   }) async {
     if (compilerOutput != null) {
       fileSystem!.file(compilerOutput!.outputFilename).createSync(recursive: true);

packages/flutter_tools/test/general.shard/web/devfs_web_test.dart

@@ -1120,7 +1120,6 @@ class FakeResidentCompiler extends Fake implements ResidentCompiler {
     FileSystem fs,
     bool suppressErrors = false,
     bool checkDartPluginRegistry = false,
-    File dartPluginRegistrant,
   }) async {
     return output;
   }