Use generic functions in zones.

tests/lib/async/stream_listen_zone_test.dart

Index: tests/lib/async/stream_listen_zone_test.dart
diff --git a/tests/lib/async/stream_listen_zone_test.dart b/tests/lib/async/stream_listen_zone_test.dart
index 6aae8fed14c73e8dd3d296dd70e1079c740382ed..86c017133099cf402e9f7f21d4f76ba58c1da5dd 100644
--- a/tests/lib/async/stream_listen_zone_test.dart
+++ b/tests/lib/async/stream_listen_zone_test.dart
@@ -64,27 +64,28 @@ void testStream(
     registerExpect += 3;
     Expect.equals(registerExpect, registerCount, name);
   },
-      zoneSpecification:
-          new ZoneSpecification(registerCallback: (self, p, z, callback()) {
+      zoneSpecification: new ZoneSpecification(
+          registerCallback: <R>(self, p, z, R callback()) {
         Expect.identical(zone, self, name);
         registerCount++;
         return () {
           Expect.identical(zone, Zone.current, name);
-          callback();
+          return callback();
         };
-      }, registerUnaryCallback: (self, p, z, callback(a)) {
+      }, registerUnaryCallback: <R, T>(self, p, z, R callback(T a)) {
         Expect.identical(zone, self, name);
         registerCount++;
         return (a) {
           Expect.identical(zone, Zone.current, name);
-          callback(a);
+          return callback(a);
         };
-      }, registerBinaryCallback: (self, package, z, callback(a, b)) {
+      }, registerBinaryCallback:
+              <R, T1, T2>(self, package, z, R callback(T1 a, T2 b)) {
         Expect.identical(zone, self, name);
         registerCount++;
         return (a, b) {
           Expect.identical(zone, Zone.current, name);
-          callback(a, b);
+          return callback(a, b);
         };
       }));