Remove _HttpUtils from dart:io.

sdk/lib/io/http_multipart_form_data_impl.dart

 // 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.
 
 part of dart.io;
 
 
 class _HttpMultipartFormData extends Stream implements HttpMultipartFormData {
   final ContentType contentType;
   final HeaderValue contentDisposition;
@@ skipping 23 matching lines @@
       StringBuffer buffer = new StringBuffer();
       Encoding encoding;
       if (contentType != null) {
         encoding = Encoding.fromName(contentType.charset);
       }
       if (encoding == null) encoding = Encoding.ISO_8859_1;
       _stream = _stream
           .transform(new StringDecoder(encoding))
           .expand((data) {
             buffer.write(data);
-            var out = _HttpUtils.decodeHttpEntityString(buffer.toString());
+            var out = _decodeHttpEntityString(buffer.toString());
             if (out != null) {
-              buffer = new StringBuffer();
+              buffer.clear();
               return [out];
             }
             return const [];
           });
     }
   }
 
   bool get isText => _isText;
   bool get isBinary => !_isText;
 
@@ skipping 34 matching lines @@
                              bool cancelOnError}) {
     return _stream.listen(onData,
                           onDone: onDone,
                           onError: onError,
                           cancelOnError: cancelOnError);
   }
 
   String value(String name) {
     return _mimeMultipart.headers[name];
   }
+
+  // Decode a string with HTTP entities. Returns null if the string ends in the
+  // middle of a http entity.
+  static String _decodeHttpEntityString(String input) {
+    int amp = input.lastIndexOf('&');
+    if (amp < 0) return input;
+    int end = input.lastIndexOf(';');
+    if (end < amp) return null;
+
+    var buffer = new StringBuffer();
+    int offset = 0;
+
+    parse(amp, end) {
+      switch (input[amp + 1]) {
+        case '#':
+          if (input[amp + 2] == 'x') {
+            buffer.writeCharCode(
+                int.parse(input.substring(amp + 3, end), radix: 16));
+          } else {
+            buffer.writeCharCode(int.parse(input.substring(amp + 2, end)));
+          }
+          break;
+
+        default:
+          throw new HttpException('Unhandled HTTP entity token');
+      }
+    }
+
+    while ((amp = input.indexOf('&', offset)) >= 0) {
+      buffer.write(input.substring(offset, amp));
+      int end = input.indexOf(';', amp);
+      parse(amp, end);
+      offset = end + 1;
+    }
+    buffer.write(input.substring(offset));
+    return buffer.toString();
+  }
 }