Fix pub tests.

sdk/lib/async/future_impl.dart

 // Copyright (c) 2012, 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;
 
 deprecatedFutureValue(_FutureImpl future) =>
   future._isComplete ? future._resultOrListeners : null;
 
 
@@ skipping 402 matching lines @@
 class _WhenFuture<T> extends _TransformFuture<T, T> {
   final _FutureAction _action;
 
   _WhenFuture(this._action);
 
   void _sendValue(T value) {
     try {
       var result = _action();
       if (result is Future) {
         Future resultFuture = result;
-        result.then((_) {
+        resultFuture.then((_) {
           _setValue(value);
-        }, onError: (AsyncError e) {
-          _setError(e);
-        });
+        }, onError: _setError);
         return;
       }
     } catch (e, s) {
       _setError(new AsyncError(e, s));
       return;
     }
+
     _setValue(value);
   }
 
   void _sendError(AsyncError error) {
     try {
       var result = _action();
       if (result is Future) {
         Future resultFuture = result;
-        result.then((_) {
+        // TODO(lrn): Find a way to combine [error] into [e].
+        resultFuture.then((_) {
           _setError(error);
-        }, onError: (AsyncError e) {
-          // TODO(lrn): Find a way to combine error into the
-          // resulting error.
-          _setError(e);
-        });
+        }, onError: _setError);
         return;
       }
     } catch (e, s) {
       error = new AsyncError.withCause(e, s, error);
     }
     _setError(error);
   }
 }
 
 /**
  * Thin wrapper around a [Future].
  *
  * This is used to return a "new" [Future] that effectively work just
  * as an existing [Future], without making this discoverable by comparing
  * identities.
  */
 class _FutureWrapper<T> implements Future<T> {
   final Future<T> _future;
 
   _FutureWrapper(this._future);
 
   Future then(function(T value), { onError(AsyncError error) }) {
     return _future.then(function, onError: onError);
   }
 
   Future catchError(function(AsyncError error), {bool test(var error)}) {
     return _future.catchError(function, test: test);
   }
 
-  Future whenComplete(action()) {
+  Future<T> whenComplete(action()) {
     return _future.whenComplete(action);
   }
 
-  Stream<T> asStream() => new Stream.fromFuture(this);
+  Stream<T> asStream() => new Stream.fromFuture(_future);
 }