Use generic functions in zones.

tools/dom/src/shared_html.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.dom.html;
 
-// TODO(jacobr): remove these typedefs when dart:async supports generic types.
-typedef R _wrapZoneCallback<A, R>(A a);
-typedef R _wrapZoneBinaryCallback<A, B, R>(A a, B b);
-
-_wrapZoneCallback/*<A, R>*/ _wrapZone/*<A, R>*/(
-    _wrapZoneCallback/*<A, R>*/ callback) {
+void Function(T) _wrapZone<T>(void Function(T) callback) {
   // For performance reasons avoid wrapping if we are in the root zone.
   if (Zone.current == Zone.ROOT) return callback;
   if (callback == null) return null;
-  return Zone.current.bindUnaryCallback/*<R, A>*/(callback, runGuarded: true);
+  return Zone.current.bindUnaryCallbackGuarded(callback);
 }
 
-_wrapZoneBinaryCallback/*<A, B, R>*/ _wrapBinaryZone/*<A, B, R>*/(
-    _wrapZoneBinaryCallback/*<A, B, R>*/ callback) {
+void Function(T1, T2) _wrapBinaryZone<T1, T2>(void Function(T1, T2) callback) {
+  // For performance reasons avoid wrapping if we are in the root zone.
   if (Zone.current == Zone.ROOT) return callback;
   if (callback == null) return null;
-  return Zone.current
-      .bindBinaryCallback/*<R, A, B>*/(callback, runGuarded: true);
+  return Zone.current.bindBinaryCallbackGuarded(callback);
 }
 
 /**
  * Alias for [querySelector]. Note this function is deprecated because its
  * semantics will be changing in the future.
  */
 @deprecated
 @Experimental()
 Element query(String relativeSelectors) => document.query(relativeSelectors);
 /**
@@ skipping 44 matching lines @@
     document.querySelectorAll(selectors);
 
 /// A utility for changing the Dart wrapper type for elements.
 abstract class ElementUpgrader {
   /// Upgrade the specified element to be of the Dart type this was created for.
   ///
   /// After upgrading the element passed in is invalid and the returned value
   /// should be used instead.
   Element upgrade(Element element);
 }