From 3895786f9854a73c92406f7f8ccf8db06d3581b7 Mon Sep 17 00:00:00 2001
From: Dan Field <dnfield@google.com>
Date: Fri, 11 Nov 2022 12:14:39 -0800
Subject: [PATCH] Revert "Load assets in flutter_test without turning event
 loop. (#115123)" (#115156)

This reverts commit 88e49ed274b5515caa9faaf03b261f9a73cf7e37.
---
 .../src/foundation/synchronous_future.dart    |  4 ++--
 .../lib/src/services/asset_bundle.dart        | 23 +++++++------------
 .../flutter_test/lib/src/_binding_io.dart     |  6 ++---
 packages/flutter_test/test/bindings_test.dart | 10 --------
 4 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/packages/flutter/lib/src/foundation/synchronous_future.dart b/packages/flutter/lib/src/foundation/synchronous_future.dart
index ccdd1073db..d214697ad9 100644
--- a/packages/flutter/lib/src/foundation/synchronous_future.dart
+++ b/packages/flutter/lib/src/foundation/synchronous_future.dart
@@ -38,11 +38,11 @@ class SynchronousFuture<T> implements Future<T> {
 
   @override
   Future<R> then<R>(FutureOr<R> Function(T value) onValue, { Function? onError }) {
-    final FutureOr<R> result = onValue(_value);
+    final dynamic result = onValue(_value);
     if (result is Future<R>) {
       return result;
     }
-    return SynchronousFuture<R>(result);
+    return SynchronousFuture<R>(result as R);
   }
 
   @override
diff --git a/packages/flutter/lib/src/services/asset_bundle.dart b/packages/flutter/lib/src/services/asset_bundle.dart
index 776035aa68..5b9fadd9e6 100644
--- a/packages/flutter/lib/src/services/asset_bundle.dart
+++ b/packages/flutter/lib/src/services/asset_bundle.dart
@@ -247,24 +247,17 @@ abstract class CachingAssetBundle extends AssetBundle {
 /// An [AssetBundle] that loads resources using platform messages.
 class PlatformAssetBundle extends CachingAssetBundle {
   @override
-  Future<ByteData> load(String key) {
+  Future<ByteData> load(String key) async {
     final Uint8List encoded = utf8.encoder.convert(Uri(path: Uri.encodeFull(key)).path);
-    final Future<ByteData>? future = ServicesBinding.instance.defaultBinaryMessenger.send('flutter/assets', encoded.buffer.asByteData())?.then((ByteData? asset) {
-      if (asset == null) {
-        throw FlutterError.fromParts(<DiagnosticsNode>[
-          _errorSummaryWithKey(key),
-          ErrorDescription('The asset does not exist or has empty data.'),
-        ]);
-      }
-      return asset;
-    });
-    if (future == null) {
+    final ByteData? asset =
+        await ServicesBinding.instance.defaultBinaryMessenger.send('flutter/assets', encoded.buffer.asByteData());
+    if (asset == null) {
       throw FlutterError.fromParts(<DiagnosticsNode>[
-          _errorSummaryWithKey(key),
-          ErrorDescription('The asset does not exist or has empty data.'),
-        ]);
+        _errorSummaryWithKey(key),
+        ErrorDescription('The asset does not exist or has empty data.'),
+      ]);
     }
-    return future;
+    return asset;
   }
 
   @override
diff --git a/packages/flutter_test/lib/src/_binding_io.dart b/packages/flutter_test/lib/src/_binding_io.dart
index 468dd9b5d5..0dc72180fd 100644
--- a/packages/flutter_test/lib/src/_binding_io.dart
+++ b/packages/flutter_test/lib/src/_binding_io.dart
@@ -6,8 +6,8 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
 import 'package:path/path.dart' as path;
 // ignore: deprecated_member_use
 import 'package:test_api/test_api.dart' as test_package;
@@ -42,7 +42,7 @@ void mockFlutterAssets() {
   /// platform messages.
   SystemChannels.navigation.setMockMethodCallHandler((MethodCall methodCall) async {});
 
-  ServicesBinding.instance.defaultBinaryMessenger.setMockMessageHandler('flutter/assets', (ByteData? message) {
+  ServicesBinding.instance.defaultBinaryMessenger.setMockMessageHandler('flutter/assets', (ByteData? message) async {
     assert(message != null);
     String key = utf8.decode(message!.buffer.asUint8List());
     File asset = File(path.join(assetFolderPath, key));
@@ -62,7 +62,7 @@ void mockFlutterAssets() {
     }
 
     final Uint8List encoded = Uint8List.fromList(asset.readAsBytesSync());
-    return SynchronousFuture<ByteData>(encoded.buffer.asByteData());
+    return Future<ByteData>.value(encoded.buffer.asByteData());
   });
 }
 
diff --git a/packages/flutter_test/test/bindings_test.dart b/packages/flutter_test/test/bindings_test.dart
index 8e5a31690a..8773abfc27 100644
--- a/packages/flutter_test/test/bindings_test.dart
+++ b/packages/flutter_test/test/bindings_test.dart
@@ -10,7 +10,6 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 
@@ -91,13 +90,4 @@ void main() {
       binding.idle();
     });
   });
-
-  testWidgets('Assets in the tester can be loaded without turning event loop', (WidgetTester tester) async {
-    bool responded = false;
-    // The particular asset does not matter, as long as it exists.
-    rootBundle.load('AssetManifest.json').then((ByteData data) {
-      responded = true;
-    });
-    expect(responded, true);
-  });
 }