More strong mode fixes for analyzer

pkg/analyzer/lib/src/cancelable_future.dart

 // Copyright (c) 2014, 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.
 
 library analyzer.src.cancelable_future;
 
 import 'dart:async';
 
 /**
  * Type of callback called when the future returned by a CancelableCompleter
@@ skipping 234 matching lines @@
   @override
   void cancel() {
     _completer._cancel();
   }
 
   @override
   Future catchError(Function onError, {bool test(Object error)}) =>
       _completer._outerCompleter.future.catchError(onError, test: test);
 
   @override
-  Future then(onValue(T value), {Function onError}) =>
+  Future/*<S>*/ then/*<S>*/(/*=S*/ onValue(T value), {Function onError}) =>
       _completer._outerCompleter.future.then(onValue, onError: onError);
 
   @override
-  Future timeout(Duration timeLimit, {onTimeout()}) {
+  Future<T> timeout(Duration timeLimit, {onTimeout()}) {
     // TODO(paulberry): Implement this in such a way that a timeout cancels
     // the future.
     return _completer._outerCompleter.future
         .timeout(timeLimit, onTimeout: onTimeout);
   }
 
   @override
   Future<T> whenComplete(action()) =>
       _completer._outerCompleter.future.whenComplete(action);
 }
@@ skipping 11 matching lines @@
   Stream<T> asStream() => _future.asStream();
 
   @override
   void cancel() {}
 
   @override
   Future catchError(Function onError, {bool test(Object error)}) =>
       _future.catchError(onError, test: test);
 
   @override
-  Future then(onValue(value), {Function onError}) =>
+  Future/*<S>*/ then/*<S>*/(/*=S*/ onValue(T value), {Function onError}) =>
       _future.then(onValue, onError: onError);
 
   @override
-  Future timeout(Duration timeLimit, {onTimeout()}) =>
+  Future<T> timeout(Duration timeLimit, {onTimeout()}) =>
       _future.timeout(timeLimit, onTimeout: onTimeout);
 
   @override
   Future<T> whenComplete(action()) => _future.whenComplete(action);
 }