Merge IO v2 branch to bleeding edge

utils/testrunner/utils.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 testrunner;
 
 /**
  * Read the contents of a file [fileName] into a [List] of [String]s.
  * If the file does not exist and [errorIfNoFile] is true, throw an
  * exception, else return an empty list.
@@ skipping 52 matching lines @@
     File f = new File(path);
     if (f.existsSync()) {
       if (filePat.hasMatch(path)) {
         files.add(path);
       }
     } else { // Try treat it as a directory.
       path = makePathAbsolute(path);
       Directory d = new Directory(path);
       if (d.existsSync()) {
         ++dirCount;
-        var lister = d.list(recursive: recurse);
-        lister.onFile = (file) {
-          if (filePat.hasMatch(file)) {
-            if (excludePat == null || !excludePat.hasMatch(file)) {
-              if (includeSymLinks || file.startsWith(path)) {
-                files.add(file);
+        d.list(recursive: recurse).listen(
+            (entity) {
+              if (entity is File) {
+                var file = entity.name;
+                if (filePat.hasMatch(file)) {
+                  if (excludePat == null || !excludePat.hasMatch(file)) {
+                    if (includeSymLinks || file.startsWith(path)) {
+                      files.add(file);
+                    }
+                  }
+                }
               }
-            }
-          }
-        };
-        lister.onDone = (complete) {
-          if (complete && --dirCount == 0) {
-            onComplete(files);
-          }
-        };
+            },
+            onDone: () {
+              if (complete && --dirCount == 0) {
+                onComplete(files);
+              }
+            });
       } else { // Does not exist.
         print('$path does not exist.');
       }
     }
   }
   if (--dirCount == 0) {
     onComplete(files);
   }
 }
 
 /**
  * Get the directory that testrunner lives in; we need it to import
  * support files into the generated scripts.
  */
 
 String get runnerDirectory {
   var libDirectory = makePathAbsolute(new Options().script);
   return libDirectory.substring(0,
       libDirectory.lastIndexOf(Platform.pathSeparator));
 }