From 883d6eadcbc4319e72e7ffb82ed9cf2c7a44ef35 Mon Sep 17 00:00:00 2001
From: Todd Volkert <tvolkert@users.noreply.github.com>
Date: Wed, 26 Jun 2019 16:56:10 -0700
Subject: [PATCH] More `HttpClientResponse implements Stream<Uint8List>` fixes
 (#35149)

https://github.com/dart-lang/sdk/issues/36900
---
 packages/flutter_tools/test/base/net_test.dart        | 7 ++++++-
 packages/flutter_tools/test/commands/create_test.dart | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/flutter_tools/test/base/net_test.dart b/packages/flutter_tools/test/base/net_test.dart
index c38437ad6bb..46da5ff3c66 100644
--- a/packages/flutter_tools/test/base/net_test.dart
+++ b/packages/flutter_tools/test/base/net_test.dart
@@ -233,7 +233,7 @@ class MockHttpClientRequest implements io.HttpClientRequest {
   }
 }
 
-class MockHttpClientResponse extends Stream<List<int>> implements io.HttpClientResponse {
+class MockHttpClientResponse implements io.HttpClientResponse {
   MockHttpClientResponse(this.statusCode);
 
   @override
@@ -253,6 +253,11 @@ class MockHttpClientResponse extends Stream<List<int>> implements io.HttpClientR
       .listen(onData, onError: onError, onDone: onDone, cancelOnError: cancelOnError);
   }
 
+  @override
+  Future<dynamic> forEach(void Function(Uint8List element) action) {
+    return Future<void>.error(const io.SocketException('test'));
+  }
+
   @override
   dynamic noSuchMethod(Invocation invocation) {
     throw 'io.HttpClientResponse - $invocation';
diff --git a/packages/flutter_tools/test/commands/create_test.dart b/packages/flutter_tools/test/commands/create_test.dart
index 68c60c8dd78..5ea6689de64 100644
--- a/packages/flutter_tools/test/commands/create_test.dart
+++ b/packages/flutter_tools/test/commands/create_test.dart
@@ -1286,7 +1286,7 @@ class MockHttpClientRequest implements HttpClientRequest {
   }
 }
 
-class MockHttpClientResponse extends Stream<List<int>> implements HttpClientResponse {
+class MockHttpClientResponse implements HttpClientResponse {
   MockHttpClientResponse(this.statusCode, {this.result});
 
   @override
@@ -1313,6 +1313,12 @@ class MockHttpClientResponse extends Stream<List<int>> implements HttpClientResp
       .listen(onData, onError: onError, onDone: onDone, cancelOnError: cancelOnError);
   }
 
+  @override
+  Future<dynamic> forEach(void Function(Uint8List element) action) {
+    action(Uint8List.fromList(result.codeUnits));
+    return Future<void>.value();
+  }
+
   @override
   dynamic noSuchMethod(Invocation invocation) {
     throw 'io.HttpClientResponse - $invocation';