From c2a93bd545205666abb260d7b41ee337359b3a57 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Mon, 20 May 2019 12:51:57 -0700
Subject: [PATCH] Fix missing return statements on function literals (#33058)

---
 .../flutter_gallery/lib/demo/material/leave_behind_demo.dart   | 1 +
 packages/flutter/lib/src/cupertino/nav_bar.dart                | 1 +
 packages/flutter_driver/lib/src/driver/driver.dart             | 2 +-
 packages/flutter_test/lib/src/binding.dart                     | 1 +
 packages/flutter_test/test/window_test.dart                    | 2 +-
 packages/flutter_tools/test/src/testbed.dart                   | 3 ++-
 packages/flutter_tools/test/test_compiler_test.dart            | 2 +-
 7 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/examples/flutter_gallery/lib/demo/material/leave_behind_demo.dart b/examples/flutter_gallery/lib/demo/material/leave_behind_demo.dart
index 44f4680772e..4756cdfdb87 100644
--- a/examples/flutter_gallery/lib/demo/material/leave_behind_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/leave_behind_demo.dart
@@ -243,6 +243,7 @@ class _LeaveBehindListItem extends StatelessWidget {
             case DismissDirection.down:
               assert(false);
           }
+          return true;
         },
         background: Container(
           color: theme.primaryColor,
diff --git a/packages/flutter/lib/src/cupertino/nav_bar.dart b/packages/flutter/lib/src/cupertino/nav_bar.dart
index a5d6725b068..d7401f2ed93 100644
--- a/packages/flutter/lib/src/cupertino/nav_bar.dart
+++ b/packages/flutter/lib/src/cupertino/nav_bar.dart
@@ -2250,4 +2250,5 @@ final HeroFlightShuttleBuilder _navBarHeroFlightShuttleBuilder = (
         topNavBar: fromNavBar,
       );
   }
+  return null;
 };
diff --git a/packages/flutter_driver/lib/src/driver/driver.dart b/packages/flutter_driver/lib/src/driver/driver.dart
index 31010c4cd87..9880b5926b9 100644
--- a/packages/flutter_driver/lib/src/driver/driver.dart
+++ b/packages/flutter_driver/lib/src/driver/driver.dart
@@ -101,7 +101,7 @@ Future<T> _warnIfSlow<T>({
   assert(future != null);
   assert(timeout != null);
   assert(message != null);
-  return future..timeout(timeout, onTimeout: () { _log.warning(message); });
+  return future..timeout(timeout, onTimeout: () { _log.warning(message); return null; });
 }
 
 /// A convenient accessor to frequently used finders.
diff --git a/packages/flutter_test/lib/src/binding.dart b/packages/flutter_test/lib/src/binding.dart
index 3ed87e1aa8a..ec2db8b5c7d 100644
--- a/packages/flutter_test/lib/src/binding.dart
+++ b/packages/flutter_test/lib/src/binding.dart
@@ -764,6 +764,7 @@ class AutomatedTestWidgetsFlutterBinding extends TestWidgetsFlutterBinding {
           final Uint8List encoded = Uint8List.fromList(asset.readAsBytesSync());
           return Future<ByteData>.value(encoded.buffer.asByteData());
         }
+        return null;
       });
     }
   }
diff --git a/packages/flutter_test/test/window_test.dart b/packages/flutter_test/test/window_test.dart
index 0fcbad5d8cc..e45c3f01855 100644
--- a/packages/flutter_test/test/window_test.dart
+++ b/packages/flutter_test/test/window_test.dart
@@ -164,7 +164,7 @@ void main() {
     );
   });
 
-  testWidgets('TestWindow can clear out fake properties all at once', (WidgetTester tester) {
+  testWidgets('TestWindow can clear out fake properties all at once', (WidgetTester tester) async {
     final double originalDevicePixelRatio = ui.window.devicePixelRatio;
     final double originalTextScaleFactor = ui.window.textScaleFactor;
     final TestWindow testWindow = retrieveTestBinding(tester).window;
diff --git a/packages/flutter_tools/test/src/testbed.dart b/packages/flutter_tools/test/src/testbed.dart
index 9582152d046..cefd08abb43 100644
--- a/packages/flutter_tools/test/src/testbed.dart
+++ b/packages/flutter_tools/test/src/testbed.dart
@@ -79,8 +79,9 @@ class Testbed {
           }
           await test();
           Cache.flutterRoot = originalFlutterRoot;
+          return null;
         }
       );
     });
   }
-}
\ No newline at end of file
+}
diff --git a/packages/flutter_tools/test/test_compiler_test.dart b/packages/flutter_tools/test/test_compiler_test.dart
index f2fb4b16a2a..04f96651600 100644
--- a/packages/flutter_tools/test/test_compiler_test.dart
+++ b/packages/flutter_tools/test/test_compiler_test.dart
@@ -19,7 +19,7 @@ void main() {
 
     setUp(() {
       testbed = Testbed(
-        setup: () {
+        setup: () async {
           fs.file('pubspec.yaml').createSync();
           fs.file('.packages').createSync();
           fs.file('test/foo.dart').createSync(recursive: true);