Remove _HttpUtils from dart:io.

sdk/lib/core/uri.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.core;
 
 /**
  * A parsed URI, as specified by RFC-3986, http://tools.ietf.org/html/rfc3986.
  */
 class Uri {
@@ skipping 751 matching lines @@
    * the individual parts.
    *
    * For handling the [path] and [query] components consider using
    * [pathSegments] and [queryParameters] to get the separated and
    * decoded component.
    */
   static String decodeComponent(String encodedComponent) {
     return _uriDecode(encodedComponent);
   }
 
-  static String decodeQueryComponent(String encodedComponent) {
-    return _uriDecode(encodedComponent, plusToSpace: true);
+  /**
+   * Decodes the percent-encoding in [encodedComponent], converting
+   * pluses to spaces.
+   *
+   * It will create a byte-list of the decoded characters, and then use
+   * [decode] to decode the byte-list to a String. Default is a UTF_8 decoder.
+   */
+  static String decodeQueryComponent(
+      String encodedComponent,
+      {String decode(List<int> bytes): decodeUtf8}) {
+    return _uriDecode(encodedComponent, plusToSpace: true, decode: decode);
   }
 
   /**
    * Encode the string [uri] using percent-encoding to make it
    * safe for literal use as a full URI.
    *
    * All characters except uppercase and lowercase letters, digits and
    * the characters `!#$&'()*+,-./:;=?@_~` are percent-encoded. This
    * is the set of characters specified in in ECMA-262 version 5.1 for
    * the encodeURI function .
@@ skipping 18 matching lines @@
    * Returns the [query] split into a map according to the rules
    * specified for FORM post in the
    * [HTML 4.01 specification section 17.13.4]
    * (http://www.w3.org/TR/REC-html40/interact/forms.html#h-17.13.4
    * "HTML 4.01 section 17.13.4"). Each key and value in the returned
    * map has been decoded. If the [query]
    * is the empty string an empty map is returned.
    *
    * Keys in the query string that have no value are mapped to the
    * empty string.
+   *
+   * Each query component will be decoded using [decode]. Default is a UTF_8
+   * decoder.
    */
-  static Map<String, String> splitQueryString(String query) {
+  static Map<String, String> splitQueryString(
+      String query,
+      {String decode(List<int> bytes): decodeUtf8}) {
     return query.split("&").fold({}, (map, element) {
       int index = element.indexOf("=");
       if (index == -1) {
         if (element != "") map[decodeQueryComponent(element)] = "";
       } else if (index != 0) {
         var key = element.substring(0, index);
         var value = element.substring(index + 1);
-        map[Uri.decodeQueryComponent(key)] = decodeQueryComponent(value);
+        map[Uri.decodeQueryComponent(key, decode: decode)] =
+            decodeQueryComponent(value, decode: decode);
       }
       return map;
     });
   }
 
   // Frequently used character codes.
   static const int _PERCENT = 0x25;
   static const int _PLUS = 0x2B;
   static const int _SLASH = 0x2F;
   static const int _ZERO = 0x30;
@@ skipping 62 matching lines @@
           byte = byte * 16 + charCode - 0x57;
         } else {
           throw new ArgumentError("Invalid URL encoding");
         }
       }
     }
     return byte;
   }
 
   /**
-   * A JavaScript-like decodeURI function. It unescapes the string [text] and
-   * returns the unescaped string.
+   * Uri-decode a percent-encoded string.
+   *
+   * It unescapes the string [text] and returns the unescaped string.
+   *
+   * This function is similar to the JavaScript-function `decodeURI`.
+   *
+   * If [plusToSpace] is `true`, plus characters will be converted to spaces.
+   *
+   * The decoder will create a byte-list of the percent-encoded parts, and then
+   * decode the byte-list using [decode]. Default is a UTF_8 decoder.
    */
-  static String _uriDecode(String text, {bool plusToSpace: false}) {
+  static String _uriDecode(String text,
+                           {bool plusToSpace: false,
+                            String decode(List<int> bytes): decodeUtf8}) {
     StringBuffer result = new StringBuffer();
     List<int> codepoints = new List<int>();
     for (int i = 0; i < text.length;) {
       int ch = text.codeUnitAt(i);
       if (ch != _PERCENT) {
         if (plusToSpace && ch == _PLUS) {
           result.write(" ");
         } else {
           result.writeCharCode(ch);
         }
         i++;
       } else {
         codepoints.clear();
         while (ch == _PERCENT) {
           if (++i > text.length - 2) {
             throw new ArgumentError('Truncated URI');
           }
           codepoints.add(_hexCharPairToByte(text, i));
           i += 2;
           if (i == text.length) break;
           ch = text.codeUnitAt(i);
         }
-        result.write(decodeUtf8(codepoints));
+        result.write(decode(codepoints));
       }
     }
     return result.toString();
   }
 
   // Tables of char-codes organized as a bit vector of 128 bits where
   // each bit indicate whether a character code on the 0-127 needs to
   // be escaped or not.
 
   // The unreserved characters of RFC 3986.
@@ skipping 179 matching lines @@
   void clear() {
     throw new UnsupportedError("Cannot modify an unmodifiable map");
   }
   void forEach(void f(K key, V value)) => _map.forEach(f);
   Iterable<K> get keys => _map.keys;
   Iterable<V> get values => _map.values;
   int get length => _map.length;
   bool get isEmpty => _map.isEmpty;
   bool get isNotEmpty => _map.isNotEmpty;
 }