Big merge from experimental to bleeding edge.

samples/dartcombat/player.dart

Index: samples/dartcombat/player.dart
diff --git a/samples/dartcombat/player.dart b/samples/dartcombat/player.dart
index 21eb1a25a1208c5f24bb28f5ea72e661316f32d3..294e217618571c9f1efcfb5a8c90259f333f63fd 100644
--- a/samples/dartcombat/player.dart
+++ b/samples/dartcombat/player.dart
@@ -75,7 +75,7 @@ class EnemyImpl implements Enemy {
   Future<int> ready() {
     Completer<int> res = new Completer<int>();
     return portToEnemy.call({ "action" : MessageIds.ENEMY_IS_READY })
-      .transform((message) {
+      .then((message) {
          if (!message[0]) throw message[1];
          return 0;
        });
@@ -84,7 +84,7 @@ class EnemyImpl implements Enemy {
   Future<int> shoot(int x, int y) {
     Completer<int> res = new Completer<int>();
     return portToEnemy.call({ "action" : MessageIds.SHOOT, "args" : [x, y] })
-      .transform((message) {
+      .then((message) {
          if (!message[0]) throw message[1];
          return message[1][0];
        });