Update dart:convert and dart:core Uri.

tool/sdk_expected_errors.txt

Index: tool/sdk_expected_errors.txt
diff --git a/tool/sdk_expected_errors.txt b/tool/sdk_expected_errors.txt
index cb61d03abd614b871b85abf0ea5a1f04098cdcc8..b92afdfbc665d7696f600e775b0fb20ec628830f 100644
--- a/tool/sdk_expected_errors.txt
+++ b/tool/sdk_expected_errors.txt
@@ -1,8 +1,17 @@
 [error] The argument type 'InternalMap' cannot be assigned to the parameter type 'Map'. (dart:_isolate_helper/isolate_serialization.dart, line 47, col 47)
 [error] Base class introduces an invalid override. The type of JSArray.[]= ((int, E) → void) is not a subtype of JSMutableIndexable.[]= ((int, dynamic) → dynamic). (dart:_interceptors/js_array.dart, line 576, col 25)
 [error] Invalid override. The type of NativeTypedArrayOfDouble.[]= ((int, num) → void) is not a subtype of JSMutableIndexable.[]= ((int, dynamic) → dynamic). (dart:_native_typed_data, line 793, col 3)
-[error] Invalid override. The type of _JsonStringStringifierPretty.writeIndentation ((int) → void) is not a subtype of _JsonPrettyPrintMixin.writeIndentation ((dynamic) → void). (dart:convert/json.dart, line 875, col 3)
-[error] Invalid override. The type of _JsonUtf8StringifierPretty.writeIndentation ((int) → void) is not a subtype of _JsonPrettyPrintMixin.writeIndentation ((dynamic) → void). (dart:convert/json.dart, line 1034, col 3)
+[error] Invalid override. The type of _UnicodeSubsetEncoder.bind ((Stream<String>) → Stream<List<int>>) is not a subtype of StreamTransformer<dynamic, dynamic>.bind ((Stream<dynamic>) → Stream<dynamic>). (dart:convert/ascii.dart, line 114, col 3)
+[error] Invalid override. The type of _UnicodeSubsetDecoder.bind ((Stream<List<int>>) → Stream<String>) is not a subtype of StreamTransformer<dynamic, dynamic>.bind ((Stream<dynamic>) → Stream<dynamic>). (dart:convert/ascii.dart, line 222, col 3)
+[error] Invalid override. The type of ChunkedConverter.startChunkedConversion ((Sink<T2>) → ChunkedConversionSink<S2>) is not a subtype of Converter<S, T>.startChunkedConversion ((Sink<dynamic>) → ChunkedConversionSink<dynamic>). (dart:convert/chunked_conversion.dart, line 33, col 3)
+[error] Invalid override. The type of ChunkedConverter.bind ((Stream<S2>) → Stream<T2>) is not a subtype of Converter<S, T>.bind ((Stream<dynamic>) → Stream<dynamic>). (dart:convert/chunked_conversion.dart, line 38, col 3)
+[error] Invalid override. The type of ChunkedConverter.bind ((Stream<S2>) → Stream<T2>) is not a subtype of StreamTransformer<dynamic, dynamic>.bind ((Stream<dynamic>) → Stream<dynamic>). (dart:convert/chunked_conversion.dart, line 38, col 3)
+[error] The redirected constructor '((List<dynamic>) → void) → _SimpleCallbackSink<dynamic>' has incompatible parameters with '((List<T>) → void) → ChunkedConversionSink<T>' (dart:convert/chunked_conversion.dart, line 74, col 45)
+[error] Invalid override. The type of JsonDecoder.bind ((Stream<String>) → Stream<Object>) is not a subtype of StreamTransformer<dynamic, dynamic>.bind ((Stream<dynamic>) → Stream<dynamic>). (dart:convert/json.dart, line 513, col 3)
+[error] Invalid override. The type of _JsonStringStringifierPretty.writeIndentation ((int) → void) is not a subtype of _JsonPrettyPrintMixin.writeIndentation ((dynamic) → void). (dart:convert/json.dart, line 905, col 3)
+[error] Invalid override. The type of _JsonUtf8StringifierPretty.writeIndentation ((int) → void) is not a subtype of _JsonPrettyPrintMixin.writeIndentation ((dynamic) → void). (dart:convert/json.dart, line 1063, col 3)
+[error] Invalid override. The type of Utf8Encoder.bind ((Stream<String>) → Stream<List<int>>) is not a subtype of StreamTransformer<dynamic, dynamic>.bind ((Stream<dynamic>) → Stream<dynamic>). (dart:convert/utf.dart, line 130, col 3)
+[error] Invalid override. The type of Utf8Decoder.bind ((Stream<List<int>>) → Stream<String>) is not a subtype of StreamTransformer<dynamic, dynamic>.bind ((Stream<dynamic>) → Stream<dynamic>). (dart:convert/utf.dart, line 370, col 3)
 [error] Invalid override. The type of DateTime.compareTo ((DateTime) → int) is not a subtype of Comparable<dynamic>.compareTo ((dynamic) → int). (dart:core/date_time.dart, line 448, col 3)
 [error] Annotation can be only constant variable or constant constructor invocation (dart:core/stacktrace.dart, line 27, col 3)
 [error] Invalid override. The type of FileList.[]= ((int, File) → void) is not a subtype of JSMutableIndexable.[]= ((int, dynamic) → dynamic). (dart:html, line 16869, col 3)
@@ -96,25 +105,23 @@
 [warning] Unsound implicit cast from dynamic to E (dart:collection, line 1620, col 47)
 [warning] Unsound implicit cast from dynamic to E (dart:collection, line 1682, col 18)
 [warning] Unsound implicit cast from dynamic to LinkedHashMap<K, V> (dart:collection/linked_hash_map.dart, line 160, col 12)
-[warning] Unsound implicit cast from List<dynamic> to List<int> (dart:convert/ascii.dart, line 96, col 12)
+[warning] Unsound implicit cast from List<dynamic> to List<int> (dart:convert/ascii.dart, line 97, col 12)
 [warning] Unsound implicit cast from Converter<S, dynamic> to Converter<S, T> (dart:convert/codec.dart, line 87, col 34)
 [warning] Unsound implicit cast from Converter<T, dynamic> to Converter<T, S> (dart:convert/codec.dart, line 88, col 34)
 [warning] Unsound implicit cast from dynamic to List<String> (dart:convert, line 311, col 12)
-[warning] Unsound implicit cast from dynamic to T (dart:convert/converter.dart, line 58, col 25)
-[warning] Unsound implicit cast from (dynamic) → dynamic to (Object) → Object (dart:convert/json.dart, line 142, col 28)
-[warning] Unsound implicit cast from (dynamic) → dynamic to (Object) → Object (dart:convert/json.dart, line 147, col 28)
-[warning] Unsound implicit cast from Function to (Object) → dynamic (dart:convert/json.dart, line 270, col 42)
-[warning] Unsound implicit cast from Function to (Object) → dynamic (dart:convert/json.dart, line 352, col 36)
-[warning] Unsound implicit cast from Function to (Object) → dynamic (dart:convert/json.dart, line 455, col 53)
-[warning] Unsound implicit cast from Map<dynamic, dynamic> to Map<String, Object> (dart:convert/json.dart, line 715, col 16)
-[warning] Unsound implicit cast from dynamic to (Object) → Object (dart:convert/json.dart, line 817, col 60)
-[warning] Unsound implicit cast from dynamic to (Object) → Object (dart:convert/json.dart, line 895, col 15)
-[warning] Unsound implicit cast from Sink<dynamic> to Sink<String> (dart:convert/line_splitter.dart, line 24, col 44)
+[warning] Unsound implicit cast from Converter<S, T> to ChunkedConverter<dynamic, dynamic, dynamic, dynamic> (dart:convert/converter.dart, line 51, col 59)
+[warning] Unsound implicit cast from ChunkedConverter<List<int>, String, List<int>, String> to StreamTransformer<List<int>, dynamic> (dart:convert/encoding.dart, line 18, col 18)
+[warning] Unsound implicit cast from (dynamic) → dynamic to (Object) → Object (dart:convert/json.dart, line 145, col 28)
+[warning] Unsound implicit cast from (dynamic) → dynamic to (Object) → Object (dart:convert/json.dart, line 150, col 28)
+[warning] Unsound implicit cast from Function to (Object) → dynamic (dart:convert/json.dart, line 273, col 42)
+[warning] Unsound implicit cast from Function to (Object) → dynamic (dart:convert/json.dart, line 357, col 36)
+[warning] Unsound implicit cast from Function to (Object) → dynamic (dart:convert/json.dart, line 460, col 53)
+[warning] Unsound implicit cast from Map<dynamic, dynamic> to Map<String, Object> (dart:convert/json.dart, line 719, col 30)
+[warning] Unsound implicit cast from dynamic to (Object) → Object (dart:convert/json.dart, line 847, col 60)
+[warning] Unsound implicit cast from dynamic to (Object) → Object (dart:convert/json.dart, line 925, col 15)
 [warning] Unsound implicit cast from dynamic to T (dart:core/expando.dart, line 55, col 12)
 [warning] Unsound implicit cast from dynamic to E (dart:core/list.dart, line 126, col 16)
 [warning] Unsound implicit cast from Iterable<int> to List<dynamic> (dart:core/string.dart, line 116, col 33)
-[warning] Unsound implicit cast from List<dynamic> to Iterable<int> (dart:core/uri.dart, line 1278, col 37)
-[warning] Unsound implicit cast from List<dynamic> to List<int> (dart:core/uri.dart, line 2023, col 12)
 [warning] The final variable 'origin' must be initialized (dart:html, line 177, col 3)
 [warning] The final variable 'origin' must be initialized (dart:html, line 813, col 3)
 [warning] Unsound implicit cast from dynamic to List<String> (dart:html, line 1145, col 33)