Further code review changes for WebSocket.fromUpgradedSocket.

tests/standalone/io/web_socket_test.dart

 // 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.
 //
 // VMOptions=
 // VMOptions=--short_socket_read
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
 import "dart:async";
@@ skipping 368 matching lines @@
                }));
       }
 
       Future.wait(futures).then((_) {
         server.close();
         client.close();
       });
     });
   }
 
-  testFromSocket() {
+  testFromUpgradedSocket() {
+    asyncStart();
     createServer().then((server) {
       server.listen((request) {
         Expect.equals('Upgrade', request.headers.value(HttpHeaders.CONNECTION));
         Expect.equals('websocket', request.headers.value(HttpHeaders.UPGRADE));
 
         var key = request.headers.value('Sec-WebSocket-Key');
         var sha1 = new SHA1()..add("$key$WEB_SOCKET_GUID".codeUnits);
         var accept = CryptoUtils.bytesToBase64(sha1.close());
         request.response
             ..statusCode = HttpStatus.SWITCHING_PROTOCOLS
             ..headers.add(HttpHeaders.CONNECTION, "Upgrade")
             ..headers.add(HttpHeaders.UPGRADE, "websocket")
             ..headers.add("Sec-WebSocket-Accept", accept);
         request.response.contentLength = 0;
-        return request.response.detachSocket()
-            .then((socket) => new WebSocket.fromUpgradedSocket(socket))
-            .then((websocket) {
+        request.response.detachSocket().then((socket) {
+          return new WebSocket.fromUpgradedSocket(socket, serverSide: true);
+        }).then((websocket) {
           websocket.add("Hello");
           websocket.close();
+          asyncEnd();
         });
       });
 
       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);
           websocket.close();
         }).asFuture();
       }).then((_) => server.close());
     });
   }
 
   void runTests() {
     testRequestResponseClientCloses(2, null, null);
     testRequestResponseClientCloses(2, 3001, null);
     testRequestResponseClientCloses(2, 3002, "Got tired");
     testRequestResponseServerCloses(2, null, null);
     testRequestResponseServerCloses(2, 3001, null);
     testRequestResponseServerCloses(2, 3002, "Got tired");
     testMessageLength(125);
     testMessageLength(126);
     testMessageLength(127);
     testMessageLength(65535);
     testMessageLength(65536);
     testDoubleCloseClient();
     testDoubleCloseServer();
     testImmediateCloseServer();
     testImmediateCloseClient();
     testNoUpgrade();
     testUsePOST();
     testConnections(10, 3002, "Got tired");
     testIndividualUpgrade(5);
-    testFromSocket();
+    testFromUpgradedSocket();
   }
 }
 
 
 void initializeSSL() {
   var testPkcertDatabase = Platform.script.resolve('pkcert').toFilePath();
   SecureSocket.initialize(database: testPkcertDatabase,
                           password: "dartdart");
 }
 
 
 main() {
   asyncStart();
   new SecurityConfiguration(secure: false).runTests();
   initializeSSL();
   new SecurityConfiguration(secure: true).runTests();
   asyncEnd();
 }