Make IOSink implement StringSink

pkg/http/test/utils.dart

-// 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.
 
 library test_utils;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:json' as json;
 import 'dart:uri';
 
@@ skipping 39 matching lines @@
       if (path == '/redirect') {
         response.statusCode = 302;
         response.headers.set('location', serverUrl.resolve('/').toString());
         response.contentLength = 0;
         response.close();
         return;
       }
 
       new ByteStream(request).toBytes().then((requestBodyBytes) {
         response.statusCode = 200;
-        response.headers.contentType = new ContentType("application", "json");
-      response.headers.set('single', 'value');
+        var encodingName = request.queryParameters['response-encoding'];
+        response.headers.contentType =
+            new ContentType("application", "json", charset: encodingName);
+        response.headers.set('single', 'value');
 
         var requestBody;
         if (requestBodyBytes.isEmpty) {
           requestBody = null;
         } else if (request.headers.contentType.charset != null) {
-          var encoding = requiredEncodingForCharset(
-              request.headers.contentType.charset);
+          var encoding = Encoding.fromName(request.headers.contentType.charset);
           requestBody = decodeString(requestBodyBytes, encoding);
         } else {
           requestBody = requestBodyBytes;
         }
 
         var content = {
           'method': request.method,
           'path': request.uri.path,
           'headers': {}
         };
         if (requestBody != null) content['body'] = requestBody;
         request.headers.forEach((name, values) {
           // These headers are automatically generated by dart:io, so we don't
           // want to test them here.
           if (name == 'cookie' || name == 'host') return;
 
           content['headers'][name] = values;
         });
 
-        var outputEncoding;
-        var encodingName = request.queryParameters['response-encoding'];
-        if (encodingName != null) {
-          outputEncoding = requiredEncodingForCharset(encodingName);
-        } else {
-          outputEncoding = Encoding.ASCII;
-        }
-
         var body = json.stringify(content);
         response.contentLength = body.length;
-        response.addString(body, outputEncoding);
+        response.write(body);
         response.close();
       });
     });
   });
 }
 
 /// Stops the current HTTP server.
 void stopServer() {
   _server.close();
   _server = null;
@@ skipping 86 matching lines @@
 const isSocketIOException = const _SocketIOException();
 
 /// A matcher for functions that throw SocketIOException.
 const Matcher throwsSocketIOException =
     const Throws(isSocketIOException);
 
 class _SocketIOException extends TypeMatcher {
   const _SocketIOException() : super("SocketIOException");
   bool matches(item, MatchState matchState) => item is SocketIOException;
 }