Big merge from experimental to bleeding edge.

runtime/tests/vm/dart/isolate_unhandled_exception_uri_test.dart

Index: runtime/tests/vm/dart/isolate_unhandled_exception_uri_test.dart
diff --git a/runtime/tests/vm/dart/isolate_unhandled_exception_uri_test.dart b/runtime/tests/vm/dart/isolate_unhandled_exception_uri_test.dart
index da7ee50f9fe1528ca373dc94fdd7c9ac68bfe3a4..00f990421de8305fc205c3ceb0b5f43095ec2721 100644
--- a/runtime/tests/vm/dart/isolate_unhandled_exception_uri_test.dart
+++ b/runtime/tests/vm/dart/isolate_unhandled_exception_uri_test.dart
@@ -18,14 +18,15 @@ void main() {
 
   // Send a message that will cause an ignorable exception to be thrown.
   Future f = isolate_port.call('throw exception');
-  f.onComplete((future) {
-    Expect.equals(null, future.exception);
+  f.catchError((error) {
+    Expect.fail("Error not expected");
   });
 
   // Verify that isolate can still handle messages.
-  isolate_port.call('hi').onComplete((future) {
-    Expect.equals(null, future.exception);
-    Expect.equals('hello', future.value);
+  isolate_port.call('hi').then((value) {
+    Expect.equals('hello', value);
+  }, onError: (error) {
+    Expect.fail("Error not expected");
   });
 
 }