Revert "Even more awaits (#184042)"

dev/benchmarks/complex_layout/test_driver/scroll_perf_bad_test.dart

@@ -17,7 +17,9 @@ void main() {
       await driver.waitUntilFirstFrameRasterized();
     });
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      driver.close();
+    });
 
     Future<void> testScrollPerf(String listKey, String summaryName) async {
       // The slight initial delay avoids starting the timing during a

dev/benchmarks/complex_layout/test_driver/scroll_perf_test.dart

@@ -17,7 +17,9 @@ void main() {
       await driver.waitUntilFirstFrameRasterized();
     });
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      driver.close();
+    });
 
     Future<void> testScrollPerf(String listKey, String summaryName) async {
       // The slight initial delay avoids starting the timing during a

dev/benchmarks/complex_layout/test_driver/semantics_perf_test.dart

@@ -33,7 +33,9 @@ void main() {
       driver = await FlutterDriver.connect(printCommunication: true);
     });
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      driver.close();
+    });
 
     test('initial tree creation', () async {
       // Let app become fully idle.

dev/benchmarks/macrobenchmarks/test/fullscreen_textfield_perf_e2e.dart

@@ -15,7 +15,7 @@ void main() {
     pageDelay: const Duration(seconds: 1),
     body: (WidgetController controller) async {
       final Finder textfield = find.byKey(const ValueKey<String>('fullscreen-textfield'));
-      await controller.tap(textfield);
+      controller.tap(textfield);
       await Future<void>.delayed(const Duration(milliseconds: 5000));
     },
   );

dev/benchmarks/macrobenchmarks/test/textfield_perf_e2e.dart

@@ -15,7 +15,7 @@ void main() {
     pageDelay: const Duration(seconds: 1),
     body: (WidgetController controller) async {
       final Finder textfield = find.byKey(const ValueKey<String>('basic-textfield'));
-      await controller.tap(textfield);
+      controller.tap(textfield);
       // Caret should be cached, so repeated blinking should not require recompute.
       await Future<void>.delayed(const Duration(milliseconds: 5000));
     },

dev/benchmarks/macrobenchmarks/test_driver/util.dart

@@ -32,7 +32,7 @@ Future<void> runDriverTestForRoute(String routeName, DriverTestCallBack body) as
 
   await body(driver);
 
-  await driver.close();
+  driver.close();
 }
 
 void macroPerfTest(

dev/benchmarks/microbenchmarks/lib/foundation/all_elements_bench.dart

@@ -41,7 +41,7 @@ Future<void> execute() async {
   );
 
   // Lists may not be scrolled into frame in landscape.
-  await SystemChrome.setPreferredOrientations(<DeviceOrientation>[
+  SystemChrome.setPreferredOrientations(<DeviceOrientation>[
     DeviceOrientation.portraitUp,
     DeviceOrientation.portraitDown,
   ]);

dev/benchmarks/platform_views_layout/test_driver/scroll_perf_ad_banners_test.dart

@@ -15,7 +15,9 @@ void main() {
       await driver.waitUntilFirstFrameRasterized();
     });
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      driver.close();
+    });
 
     Future<void> testScrollPerf(String listKey, String summaryName) async {
       // The slight initial delay avoids starting the timing during a

dev/benchmarks/platform_views_layout/test_driver/scroll_perf_bottom_ad_banner_test.dart

@@ -15,7 +15,9 @@ void main() {
       await driver.waitUntilFirstFrameRasterized();
     });
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      driver.close();
+    });
 
     Future<void> testScrollPerf(String listKey, String summaryName) async {
       // The slight initial delay avoids starting the timing during a

dev/benchmarks/platform_views_layout/test_driver/scroll_perf_hcpp_test.dart

@@ -15,7 +15,9 @@ void main() {
       await driver.waitUntilFirstFrameRasterized();
     });
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      driver.close();
+    });
 
     Future<void> testScrollPerf(String listKey, String summaryName) async {
       // The slight initial delay avoids starting the timing during a

dev/benchmarks/platform_views_layout/test_driver/scroll_perf_non_intersecting_test.dart

@@ -15,7 +15,9 @@ void main() {
       await driver.waitUntilFirstFrameRasterized();
     });
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      driver.close();
+    });
 
     Future<void> testScrollPerf(String listKey, String summaryName) async {
       // The slight initial delay avoids starting the timing during a

dev/benchmarks/platform_views_layout/test_driver/scroll_perf_test.dart

@@ -15,7 +15,9 @@ void main() {
       await driver.waitUntilFirstFrameRasterized();
     });
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      driver.close();
+    });
 
     Future<void> testScrollPerf(String listKey, String summaryName) async {
       // The slight initial delay avoids starting the timing during a

dev/benchmarks/platform_views_layout_hybrid_composition/test_driver/scroll_perf_test.dart

@@ -15,7 +15,9 @@ void main() {
       await driver.waitUntilFirstFrameRasterized();
     });
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      driver.close();
+    });
 
     Future<void> testScrollPerf(String listKey, String summaryName) async {
       // The slight initial delay avoids starting the timing during a

dev/benchmarks/test_apps/stocks/test_driver/scroll_perf_test.dart

@@ -15,7 +15,9 @@ void main() {
       driver = await FlutterDriver.connect();
     });
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      driver.close();
+    });
 
     test('measure', () async {
       final Timeline timeline = await driver.traceAction(() async {

dev/benchmarks/test_apps/stocks/test_driver/stock_view_test.dart

@@ -15,7 +15,9 @@ void main() {
       driver = await FlutterDriver.connect();
     });
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      driver.close();
+    });
 
     test('Stock list is shown', () async {
       final SerializableFinder stockList = find.byValueKey('stock-list');

dev/integration_tests/android_engine_test/lib/external_texture/surface_producer_smiley_face_main.dart

@@ -25,7 +25,7 @@ void main() async {
   enableFlutterDriverExtension(commands: <CommandExtension>[nativeDriverCommands]);
 
   // Run on full screen.
-  await SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
+  SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
 
   // Fetch the texture ID.
   final Future<int> textureId = _fetchTexture(512, 512);

dev/integration_tests/android_engine_test/lib/external_texture/surface_texture_smiley_face_main.dart

@@ -25,7 +25,7 @@ void main() async {
   enableFlutterDriverExtension(commands: <CommandExtension>[nativeDriverCommands]);
 
   // Run on full screen.
-  await SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
+  SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
 
   // Fetch the texture ID.
   final Future<int> textureId = _fetchTexture(512, 512);

dev/integration_tests/android_engine_test/lib/flutter_rendered_blue_rectangle_main.dart

@@ -9,12 +9,12 @@ import 'package:flutter_driver/driver_extension.dart';
 
 import 'src/allow_list_devices.dart';
 
-void main() async {
+void main() {
   ensureAndroidDevice();
   enableFlutterDriverExtension(commands: <CommandExtension>[nativeDriverCommands]);
 
   // Run on full screen.
-  await SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
+  SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
 
   runApp(const MainApp());
 }

dev/integration_tests/android_verified_input/test_driver/main_test.dart

@@ -14,7 +14,9 @@ Future<void> main() async {
     driver = await FlutterDriver.connect();
   });
 
-  tearDownAll(driver.close);
+  tearDownAll(() {
+    driver.close();
+  });
 
   test('verified input', () async {
     // Wait for the PlatformView to show up.

dev/integration_tests/android_views/test_driver/main_test.dart

@@ -12,8 +12,8 @@ Future<void> main() async {
     driver = await FlutterDriver.connect();
   });
 
-  tearDownAll(() async {
-    await driver?.close();
+  tearDownAll(() {
+    driver?.close();
   });
 
   // Each test below must return back to the home page after finishing.

dev/integration_tests/deferred_components_test/test_driver/main_test.dart

@@ -12,7 +12,9 @@ Future<void> main() async {
     driver = await FlutterDriver.connect();
   });
 
-  tearDownAll(driver.close);
+  tearDownAll(() {
+    driver.close();
+  });
 
   // Run `run_release_test.sh` to also test release engine deferred components code. This
   // drive test runs as debug and thus only tests framework side deferred components handling.

dev/integration_tests/display_cutout_rotation/integration_test/display_cutout_test.dart

@@ -98,10 +98,10 @@ void main() {
       );
     });
 
-    tearDown(() async {
+    tearDown(() {
       // After each test reset to device perfered orientations to avoid
       // test pollution.
-      await SystemChrome.setPreferredOrientations(<DeviceOrientation>[]);
+      SystemChrome.setPreferredOrientations(<DeviceOrientation>[]);
     });
   });
 }
@@ -116,7 +116,7 @@ Future<void> setOrientationAndWaitUntilRotation(
   WidgetTester tester,
   DeviceOrientation orientation,
 ) async {
-  await SystemChrome.setPreferredOrientations(<DeviceOrientation>[orientation]);
+  SystemChrome.setPreferredOrientations(<DeviceOrientation>[orientation]);
   Orientation expectedOrientation;
   switch (orientation) {
     case DeviceOrientation.portraitUp:

dev/integration_tests/flavors/test_driver/main_test.dart

@@ -19,6 +19,8 @@ void main() {
       expect(flavor, 'paid');
     }, timeout: Timeout.none);
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      driver.close();
+    });
   });
 }

dev/integration_tests/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart

@@ -145,7 +145,7 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> {
       // the SystemNavigator. If this wasn't the root route, then
       // Navigator.maybePop could be used instead.
       // See https://github.com/flutter/flutter/issues/11490
-      await SystemNavigator.pop();
+      SystemNavigator.pop();
     }
   }
 

dev/integration_tests/flutter_gallery/lib/demo/material/text_form_field_demo.dart

@@ -174,7 +174,7 @@ class TextFormFieldDemoState extends State<TextFormFieldDemo> {
       // the SystemNavigator. If this wasn't the root route, then
       // Navigator.maybePop could be used instead.
       // See https://github.com/flutter/flutter/issues/11490
-      await SystemNavigator.pop();
+      SystemNavigator.pop();
     }
   }
 

dev/integration_tests/flutter_gallery/test_driver/page_transitions_perf_test.dart

@@ -15,7 +15,9 @@ void main() {
       await driver.waitUntilFirstFrameRasterized();
     });
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      driver.close();
+    });
 
     test('measure', () async {
       final Timeline timeline = await driver.traceAction(() async {

dev/integration_tests/flutter_gallery/test_driver/scroll_perf_test.dart

@@ -15,7 +15,9 @@ void main() {
       await driver.waitUntilFirstFrameRasterized();
     });
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      driver.close();
+    });
 
     test('measure', () async {
       final Timeline timeline = await driver.traceAction(() async {

dev/integration_tests/flutter_gallery/test_driver/scroll_perf_web_test.dart

@@ -13,7 +13,9 @@ void main() {
       driver = await FlutterDriver.connect();
     });
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      driver.close();
+    });
 
     test('measure', () async {
       await driver.tap(find.text('Material'));

dev/integration_tests/flutter_gallery/test_driver/transitions_perf_test.dart

@@ -185,7 +185,9 @@ void main([List<String> args = const <String>[]]) {
       }
     });
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      await driver.close();
+    });
 
     test(
       'find.bySemanticsLabel',

dev/integration_tests/hybrid_android_views/test_driver/main_test.dart

@@ -12,7 +12,9 @@ Future<void> main() async {
     driver = await FlutterDriver.connect();
   });
 
-  tearDownAll(driver.close);
+  tearDownAll(() {
+    driver.close();
+  });
 
   // Each test below must return back to the home page after finishing.
   test('MotionEvent recomposition', () async {

dev/integration_tests/ios_platform_view_tests/test_driver/main_test.dart

@@ -14,7 +14,7 @@ void main() {
       driver = await FlutterDriver.connect();
     });
 
-    tearDownAll(driver.close);
+    tearDownAll(() => driver.close());
 
     test('Merge thread to create and remove platform views should not crash', () async {
       // Start pushing in a page with platform view, merge threads.

dev/integration_tests/new_gallery/lib/pages/backdrop.dart

@@ -257,9 +257,9 @@ class _SettingsIcon extends AnimatedWidget {
                 : Theme.of(context).colorScheme.secondaryContainer,
             clipBehavior: Clip.antiAlias,
             child: InkWell(
-              onTap: () async {
+              onTap: () {
                 toggleSettings();
-                await SemanticsService.sendAnnouncement(
+                SemanticsService.sendAnnouncement(
                   View.of(context),
                   _settingsSemanticLabel(isSettingsOpenNotifier.value, context),
                   GalleryOptions.of(context).resolvedTextDirection()!,

dev/integration_tests/platform_interaction/test_driver/main_test.dart

@@ -27,6 +27,8 @@ void main() {
       }
     }, timeout: Timeout.none);
 
-    tearDownAll(driver.close);
+    tearDownAll(() async {
+      driver.close();
+    });
   });
 }

dev/integration_tests/ui/test_driver/commands_debug_paint_test.dart

@@ -12,7 +12,9 @@ void main() {
     driver = await FlutterDriver.connect();
   });
 
-  tearDownAll(driver.close);
+  tearDownAll(() async {
+    await driver.close();
+  });
 
   test('check that we are painting in debugPaintSize mode', () async {
     expect(await driver.requestData('status'), 'log: paint debugPaintSize');

dev/integration_tests/ui/test_driver/commands_none_test.dart

@@ -12,7 +12,9 @@ void main() {
     driver = await FlutterDriver.connect();
   });
 
-  tearDownAll(driver.close);
+  tearDownAll(() async {
+    await driver.close();
+  });
 
   test('check that we are in normal mode', () async {
     expect(await driver.requestData('status'), 'log: paint');

dev/integration_tests/ui/test_driver/commands_performance_overlay_test.dart

@@ -12,7 +12,9 @@ void main() {
     driver = await FlutterDriver.connect();
   });
 
-  tearDownAll(driver.close);
+  tearDownAll(() async {
+    await driver.close();
+  });
 
   test('check that we are showing the performance overlay', () async {
     await driver.requestData('status'); // force a reassemble