Big merge from experimental to bleeding edge.

sdk/lib/_internal/dartdoc/test/dartdoc_test.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.
 
 /// Unit tests for doc.
 library dartdocTests;
 
 import 'dart:io';
 
 // TODO(rnystrom): Use "package:" URL (#4968).
@@ skipping 128 matching lines @@
     });
 
   });
 }
 
 Future _runDartdoc(List<String> arguments, {int exitCode: 0}) {
   var dartBin = new Options().executable;
   var dartdoc = 'bin/dartdoc.dart';
   arguments.insertRange(0, 1, dartdoc);
   return Process.run(dartBin, arguments)
-      .transform((result) {
+      .then((result) {
         expect(result.exitCode, exitCode);
       });
 }