| Index: tests/standalone/src/EchoServerStreamTest.dart
 | 
| diff --git a/tests/standalone/src/EchoServerStreamTest.dart b/tests/standalone/src/EchoServerStreamTest.dart
 | 
| index 6f47b0507e5d931f3a91e2e511d97ce42c35cd54..e84f19a84a48b5a677d3cd7fef2954f9b9d7d357 100644
 | 
| --- a/tests/standalone/src/EchoServerStreamTest.dart
 | 
| +++ b/tests/standalone/src/EchoServerStreamTest.dart
 | 
| @@ -1,4 +1,4 @@
 | 
| -// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 | 
| +// Copyright (c) 2012, 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.
 | 
|  //
 | 
| @@ -49,7 +49,7 @@ class EchoServerGame {
 | 
|          int offset = 0;
 | 
|          List<int> data;
 | 
|  
 | 
| -        void onClose() {
 | 
| +        void onClosed() {
 | 
|            Expect.equals(MSGSIZE, offset);
 | 
|            _messages++;
 | 
|            if (_messages < MESSAGES) {
 | 
| @@ -79,11 +79,11 @@ class EchoServerGame {
 | 
|          }
 | 
|  
 | 
|          if (_messages % 2 == 0) data = new List<int>(MSGSIZE);
 | 
| -        inputStream.dataHandler = onData;
 | 
| -        inputStream.closeHandler = onClose;
 | 
| +        inputStream.onData = onData;
 | 
| +        inputStream.onClosed = onClosed;
 | 
|        }
 | 
|  
 | 
| -      _socket.errorHandler = errorHandler;
 | 
| +      _socket.onError = errorHandler;
 | 
|  
 | 
|        // Test both write and writeFrom in different forms.
 | 
|        switch (_messages % 4) {
 | 
| @@ -108,7 +108,7 @@ class EchoServerGame {
 | 
|  
 | 
|      _socket = new Socket(TestingServer.HOST, _port);
 | 
|      if (_socket !== null) {
 | 
| -      _socket.connectHandler = connectHandler;
 | 
| +      _socket.onConnect = connectHandler;
 | 
|      } else {
 | 
|        Expect.fail("socket creation failed");
 | 
|      }
 | 
| @@ -167,8 +167,8 @@ class EchoServer extends TestingServer {
 | 
|      }
 | 
|  
 | 
|      inputStream = connection.inputStream;
 | 
| -    inputStream.dataHandler = dataReceived;
 | 
| -    connection.errorHandler = errorHandler;
 | 
| +    inputStream.onData = dataReceived;
 | 
| +    connection.onError = errorHandler;
 | 
|    }
 | 
|  }
 | 
|  
 | 
| 
 |