Further code review changes for WebSocket.fromUpgradedSocket.

tests/standalone/io/web_socket_test.dart

Index: tests/standalone/io/web_socket_test.dart
diff --git a/tests/standalone/io/web_socket_test.dart b/tests/standalone/io/web_socket_test.dart
index 27a903e1ed326aca99f7f6da0976ccb1d78a989a..586f3760814279c527731e590fc6f1e07afc803e 100644
--- a/tests/standalone/io/web_socket_test.dart
+++ b/tests/standalone/io/web_socket_test.dart
@@ -386,7 +386,7 @@ class SecurityConfiguration {
     });
   }
 
-  testFromSocket() {
+  testFromUpgradedSocket() {

[Anders Johnsen, 2014/05/01 05:53:04]

It would be nice if you added a asyncStart/asyncEnd, to ensure it actually
executes the code we expect.

[nweiz, 2014/05/01 18:13:14]

Done.

     createServer().then((server) {
       server.listen((request) {
         Expect.equals('Upgrade', request.headers.value(HttpHeaders.CONNECTION));
@@ -401,7 +401,7 @@ class SecurityConfiguration {
             ..headers.add(HttpHeaders.UPGRADE, "websocket")
             ..headers.add("Sec-WebSocket-Accept", accept);
         request.response.contentLength = 0;
-        return request.response.detachSocket()
+        request.response.detachSocket()
             .then((socket) => new WebSocket.fromUpgradedSocket(socket))
             .then((websocket) {
           websocket.add("Hello");
@@ -411,8 +411,6 @@ class SecurityConfiguration {
 
       var url = '${secure ? "wss" : "ws"}://$HOST_NAME:${server.port}/';
 
-      var client = new HttpClient();
-      var completer = new Completer();
       WebSocket.connect(url).then((websocket) {
         return websocket.listen((message) {
           Expect.equals("Hello", message);
@@ -442,7 +440,7 @@ class SecurityConfiguration {
     testUsePOST();
     testConnections(10, 3002, "Got tired");
     testIndividualUpgrade(5);
-    testFromSocket();
+    testFromUpgradedSocket();
   }
 }