Merge IO v2 branch to bleeding edge

tests/standalone/io/socket_port_test.dart

Index: tests/standalone/io/socket_port_test.dart
diff --git a/tests/standalone/io/socket_port_test.dart b/tests/standalone/io/socket_port_test.dart
index 841e1444f4b30eb7dccdd6dce3e53fbf56eeedd1..009a522c9f12b7d64c5b0e35c8e2f00ec16959dc 100644
--- a/tests/standalone/io/socket_port_test.dart
+++ b/tests/standalone/io/socket_port_test.dart
@@ -1,21 +1,20 @@
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2013, 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.
 
 import "dart:io";
 
 void testPort() {
-  ServerSocket server = new ServerSocket("127.0.0.1", 0, 5);
-
-  Socket clientSocket = new Socket("127.0.0.1", server.port);
-
-  server.onConnection = (Socket socket) {
-    Expect.equals(socket.port, server.port);
-    Expect.equals(clientSocket.port, socket.remotePort);
-    Expect.equals(clientSocket.remotePort, socket.port);
-
-    server.close();
-  };
+  ServerSocket.bind().then((server) {
+    Socket.connect("127.0.0.1", server.port).then((clientSocket) {
+      server.listen((Socket socket) {
+          Expect.equals(socket.port, server.port);
+        Expect.equals(clientSocket.port, socket.remotePort);
+        Expect.equals(clientSocket.remotePort, socket.port);
+        server.close();
+      });
+    });
+  });
 }
 
 void main() {