Work around is check issue causing zone error handlers to never fire. Update test expectations to r…

tool/input_sdk/lib/async/zone.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of dart.async;
 
 typedef R ZoneCallback<R>();
 typedef R ZoneUnaryCallback<R, T>(T arg);
 typedef R ZoneBinaryCallback<R, T1, T2>(T1 arg1, T2 arg2);
 
@@ skipping 1256 matching lines @@
  */
 /*=R*/ runZoned/*<R>*/(/*=R*/ body(),
                  { Map zoneValues,
                    ZoneSpecification zoneSpecification,
                    Function onError }) {
   HandleUncaughtErrorHandler errorHandler;
   if (onError != null) {
     errorHandler = (Zone self, ZoneDelegate parent, Zone zone,
                     error, StackTrace stackTrace) {
       try {
-        if (onError is ZoneBinaryCallback<dynamic/*=R*/, dynamic, StackTrace>) {
-          return self.parent.runBinary(onError, error, stackTrace);
+        // Change this is check back to
+        // onError is ZoneBinaryCallback<dynamic/*=R*/, dynamic, StackTrace>
+        // once is checks for that type are handled correctly.
+        if (onError is ZoneBinaryCallback<dynamic, dynamic, StackTrace>) {
+          return self.parent.runBinary(onError, error, stackTrace) as Object/*=R*/;
         }
         return self.parent.runUnary(onError, error);
       } catch(e, s) {
         if (identical(e, error)) {
           return parent.handleUncaughtError(zone, error, stackTrace);
         } else {
           return parent.handleUncaughtError(zone, e, s);
         }
       }
     };
   }
   if (zoneSpecification == null) {
     zoneSpecification =
         new ZoneSpecification(handleUncaughtError: errorHandler);
   } else if (errorHandler != null) {
     zoneSpecification =
         new ZoneSpecification.from(zoneSpecification,
                                    handleUncaughtError: errorHandler);
   }
   Zone zone = Zone.current.fork(specification: zoneSpecification,
                                 zoneValues: zoneValues);
   if (onError != null) {
     return zone.runGuarded(body);
   } else {
     return zone.run(body);
   }
 }