Merge IO v2 branch to bleeding edge

tests/standalone/io/secure_no_builtin_roots_test.dart

Index: tests/standalone/io/secure_no_builtin_roots_test.dart
diff --git a/tests/standalone/io/secure_no_builtin_roots_test.dart b/tests/standalone/io/secure_no_builtin_roots_test.dart
index 40dbe21b8812dd726d6e6357e4d1022f08e46a45..9b6f48911e302ed0d6aa3dc1b0e5fbf68c8c575c 100644
--- a/tests/standalone/io/secure_no_builtin_roots_test.dart
+++ b/tests/standalone/io/secure_no_builtin_roots_test.dart
@@ -5,28 +5,20 @@
 import "dart:io";
 import "dart:uri";
 import "dart:isolate";
+import "dart:async";
 
 void testGoogleUrl() {
-  ReceivePort keepalivePort = new ReceivePort();
+  ReceivePort keepAlive = new ReceivePort();
   HttpClient client = new HttpClient();
-
-  void testUrl(String url) {
-    var requestUri = Uri.parse(url);
-    var conn = client.getUrl(requestUri);
-
-    conn.onRequest = (HttpClientRequest request) {
-      request.outputStream.close();
-    };
-    conn.onResponse = (HttpClientResponse response) {
-      Expect.fail("Https connection unexpectedly succeeded");
-    };
-    conn.onError = (error) {
-      Expect.isTrue(error is SocketIOException);
-      keepalivePort.close();
-    };
-  }
-
-  testUrl('https://www.google.com');
+  client.getUrl(Uri.parse('https://www.google.com'))
+      .then((request) => request.close())
+      .then((response) => Expect.fail("Unexpected successful connection"))
+      .catchError((error) {
+        Expect.isTrue(error is AsyncError);
+        Expect.isTrue(error.error is SocketIOException);
+        keepAlive.close();
+        client.close();
+      });
 }
 
 void InitializeSSL() {