Remove Encoding-enum from dart:io and add interface in dart:convert.

pkg/http_server/lib/src/http_body_impl.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.
 
 part of http_server;
 
 class _HttpBodyHandlerTransformer
     extends StreamEventTransformer<HttpRequest, HttpRequestBody> {
   final Encoding _defaultEncoding;
   _HttpBodyHandlerTransformer(this._defaultEncoding);
@@ skipping 35 matching lines @@
       return stream
           .fold(new BytesBuilder(), (builder, data) => builder..add(data))
           .then((builder) => new _HttpBody(contentType,
                                            "binary",
                                            builder.takeBytes()));
     }
 
     Future<HttpBody> asText(Encoding defaultEncoding) {
       var encoding;
       var charset = contentType.charset;
-      if (charset != null) encoding = Encoding.fromName(charset);
+      if (charset != null) encoding = Encoding.getByName(charset);
       if (encoding == null) encoding = defaultEncoding;
       return stream
-          .transform(new StringDecoder(encoding))
+          .transform(encoding.decoder)
           .fold(new StringBuffer(), (buffer, data) => buffer..write(data))
           .then((buffer) => new _HttpBody(contentType,
                                           "text",
                                           buffer.toString()));
     }
 
     Future<HttpBody> asFormData() {
       return stream
           .transform(new MimeMultipartTransformer(
                 contentType.parameters['boundary']))
@@ skipping 30 matching lines @@
             return new _HttpBody(contentType, 'form', map);
           });
     }
 
     if (contentType == null) {
       return asBinary();
     }
 
     switch (contentType.primaryType) {
       case "text":
-        return asText(Encoding.ASCII);
+        return asText(ASCII);
 
       case "application":
         switch (contentType.subType) {
           case "json":
-            return asText(Encoding.UTF_8)
+            return asText(UTF8)
                 .then((body) => new _HttpBody(contentType,
                                               "json",
                                               JSON.parse(body.body)));
 
           case "x-www-form-urlencoded":
-            return asText(Encoding.ASCII)
+            return asText(ASCII)
                 .then((body) {
                   var map = Uri.splitQueryString(body.body,
-                      decode: (s) => _decodeString(s, defaultEncoding));
+                      decode: (s) => defaultEncoding.decode(s));
                   var result = {};
                   for (var key in map.keys) {
                     result[key] = map[key];
                   }
                   return new _HttpBody(contentType, "form", result);
                 });
 
           default:
             break;
         }
         break;
 
       case "multipart":
         switch (contentType.subType) {
           case "form-data":
             return asFormData();
 
           default:
             break;
         }
         break;
 
       default:
         break;
     }
 
     return asBinary();
   }
-
-  // Utility function to synchronously decode a list of bytes.
-  static String _decodeString(List<int> bytes,
-                              [Encoding encoding = Encoding.UTF_8]) {
-    if (bytes.length == 0) return "";
-    var string;
-    var error;
-    var controller = new StreamController(sync: true);
-    controller.stream
-      .transform(new StringDecoder(encoding))
-      .listen((data) => string = data,
-              onError: (e) => error = e);
-    controller.add(bytes);
-    controller.close();
-    if (error != null) throw error;
-    assert(string != null);
-    return string;
-  }
 }
 
 class _HttpBodyFileUpload implements HttpBodyFileUpload {
   final ContentType contentType;
   final String filename;
   final dynamic content;
   _HttpBodyFileUpload(this.contentType, this.filename, this.content);
 }
 
 class _HttpBody implements HttpBody {
@@ skipping 27 matching lines @@
   _HttpClientResponseBody(HttpClientResponse response, HttpBody body)
       : super(body.contentType, body.type, body.body),
         this.response = response;
 
   int get statusCode => response.statusCode;
 
   String get reasonPhrase => response.reasonPhrase;
 
   HttpHeaders get headers => response.headers;
 }