Update dart:convert and dart:core Uri.

tool/input_sdk/patch/convert_patch.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.
 
 // Patch file for dart:convert library.
 
-import 'dart:_js_helper' show patch;
+import 'dart:_js_helper' show argumentErrorValue, patch;
 import 'dart:_foreign_helper' show JS;
 import 'dart:_interceptors' show JSExtendableArray;
 import 'dart:_internal' show MappedIterable, ListIterable;
 import 'dart:collection' show Maps, LinkedHashMap;
 
 /**
  * Parses [json] and builds the corresponding parsed JSON value.
  *
  * Parsed JSON values Nare of the types [num], [String], [bool], [Null],
  * [List]s of parsed JSON values or [Map]s from [String] to parsed
  * JSON values.
  *
  * The optional [reviver] function, if provided, is called once for each object
  * or list property parsed. The arguments are the property name ([String]) or
  * list index ([int]), and the value is the parsed value.  The return value of
  * the reviver will be used as the value of that property instead of the parsed
  * value.  The top level value is passed to the reviver with the empty string as
  * a key.
  *
  * Throws [FormatException] if the input is not valid JSON text.
  */
 @patch
 _parseJson(String source, reviver(key, value)) {
-  if (source is! String) throw new ArgumentError(source);
+  if (source is! String) throw argumentErrorValue(source);
 
   var parsed;
   try {
     parsed = JS('=Object|JSExtendableArray|Null|bool|num|String',
-                'dart.global.JSON.parse(#)',
+                'JSON.parse(#)',
                 source);
   } catch (e) {
     throw new FormatException(JS('String', 'String(#)', e));
   }
 
   if (reviver == null) {
     return _convertJsonToDartLazy(parsed);
   } else {
     return _convertJsonToDart(parsed, reviver);
   }
@@ skipping 86 matching lines @@
   // We keep track of the map entries that we have already
   // processed by adding them to a separate JavaScript object.
   var _processed = _newJavaScriptObject();
 
   // If the data slot isn't null, it represents either the list
   // of keys (for non-upgraded JSON maps) or the upgraded map.
   var _data = null;
 
   _JsonMap(this._original);
 
-  operator[](Object key) {
+  operator[](key) {
     if (_isUpgraded) {
       return _upgradedMap[key];
     } else if (key is !String) {
       return null;
     } else {
       var result = _getProperty(_processed, key);
       if (_isUnprocessed(result)) result = _process(key);
       return result;
     }
   }
@@ skipping 29 matching lines @@
       _upgrade()[key] = value;
     }
   }
 
   void addAll(Map other) {
     other.forEach((key, value) {
       this[key] = value;
     });
   }
 
-  bool containsValue(Object value) {
+  bool containsValue(value) {
     if (_isUpgraded) return _upgradedMap.containsValue(value);
     List<String> keys = _computeKeys();
     for (int i = 0; i < keys.length; i++) {
       String key = keys[i];
       if (this[key] == value) return true;
     }
     return false;
   }
 
-  bool containsKey(Object key) {
+  bool containsKey(key) {
     if (_isUpgraded) return _upgradedMap.containsKey(key);
     if (key is !String) return false;
     return _hasProperty(_original, key);
   }
 
   putIfAbsent(key, ifAbsent()) {
     if (containsKey(key)) return this[key];
     var value = ifAbsent();
     this[key] = value;
     return value;
@@ skipping 179 matching lines @@
     _sink.add(decoded);
     _sink.close();
   }
 }
 
 @patch class Utf8Decoder {
   @patch
   Converter<List<int>,dynamic> fuse(Converter<String, dynamic> next) {
     return super.fuse(next);
   }
+
+  // Currently not intercepting UTF8 decoding.
+  @patch
+  static String _convertIntercepted(bool allowMalformed, List<int> codeUnits,
+                                    int start, int end) {
+    return null;  // This call was not intercepted.
+  }
 }