Tighten types in test.dart even more.

tools/testing/dart/android.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.
 
 library android;
 
 import "dart:async";
 import "dart:convert" show LineSplitter, UTF8;
 import "dart:core";
 import "dart:collection";
@@ skipping 58 matching lines @@
     }
 
     var results = await Future.wait([
       getOutput(process.stdout),
       getOutput(process.stderr),
       process.exitCode
     ]);
     if (timer != null) timer.cancel();
 
     String command = "$executable ${args.join(' ')}";
-    return new AdbCommandResult(
-        command, results[0], results[1], results[2], timedOut);
+    return new AdbCommandResult(command, results[0] as String,
+        results[1] as String, results[2] as int, timedOut);
   });
 }
 
 /**
  * Helper class to loop through all adb ports.
  *
  * The ports come in pairs:
  *  - even number: console connection
  *  - odd number: adb connection
  * Note that this code doesn't check if the ports are used.
@@ skipping 153 matching lines @@
    * Upload data to the device.
    */
   Future pushData(Path local, Path remote) {
     return _adbCommand(['push', '$local', '$remote']);
   }
 
   /**
    * Upload data to the device, unless [local] is the same as the most recently
    * used source for [remote].
    */
-  Future pushCachedData(String local, String remote) {
+  Future<AdbCommandResult> pushCachedData(String local, String remote) {
     if (_cachedData[remote] == local) {
       return new Future.value(
           new AdbCommandResult("Skipped cached push", "", "", 0, false));
     }
     _cachedData[remote] = local;
     return _adbCommand(['push', local, remote]);
   }
 
   /**
    * Change permission of directory recursively.
@@ skipping 118 matching lines @@
   static RegExp _deviceLineRegexp =
       new RegExp(r'^([a-zA-Z0-9_-]+)[ \t]+device$', multiLine: true);
 
   static Future<List<String>> listDevices() {
     return Process.run('adb', ['devices']).then((ProcessResult result) {
       if (result.exitCode != 0) {
         throw new Exception("Could not list devices [stdout: ${result.stdout},"
             "stderr: ${result.stderr}]");
       }
       return _deviceLineRegexp
-          .allMatches(result.stdout)
+          .allMatches(result.stdout as String)
           .map((Match m) => m.group(1))
           .toList();
     });
   }
 }
 
 /**
  * Represents an android intent.
  */
 class Intent {
@@ skipping 39 matching lines @@
 
   void releaseDevice(AdbDevice device) {
     if (_waiter.length > 0) {
       Completer completer = _waiter.removeFirst();
       completer.complete(device);
     } else {
       _idleDevices.add(device);
     }
   }
 }