Update dart:convert and dart:core Uri.

tool/input_sdk/lib/convert/string_conversion.dart

Index: tool/input_sdk/lib/convert/string_conversion.dart
diff --git a/tool/input_sdk/lib/convert/string_conversion.dart b/tool/input_sdk/lib/convert/string_conversion.dart
index 47329923f4058d05781771894605804e330b079a..bdfd39b27e636017ebcdfdce396846fb446d1257 100644
--- a/tool/input_sdk/lib/convert/string_conversion.dart
+++ b/tool/input_sdk/lib/convert/string_conversion.dart
@@ -93,13 +93,14 @@ class _ClosableStringSink implements ClosableStringSink {
 
   _ClosableStringSink(this._sink, this._callback);
 
-  void close() => _callback();
+  void close() { _callback(); }
 
-  void writeCharCode(int charCode) => _sink.writeCharCode(charCode);
-  void write(Object o) => _sink.write(o);
-  void writeln([Object o = ""]) => _sink.writeln(o);
-  void writeAll(Iterable objects, [String separator = ""])
-      => _sink.writeAll(objects, separator);
+  void writeCharCode(int charCode) { _sink.writeCharCode(charCode); }
+  void write(Object o) { _sink.write(o); }
+  void writeln([Object o = ""]) { _sink.writeln(o); }
+  void writeAll(Iterable objects, [String separator = ""]) {
+    _sink.writeAll(objects, separator);
+  }
 }
 
 /**
@@ -129,7 +130,6 @@ class _StringConversionSinkAsStringSinkAdapter implements ClosableStringSink {
 
   void write(Object o) {
     if (_buffer.isNotEmpty) _flush();
-    String str = o.toString();
     _chunkedSink.add(o.toString());
   }
 
@@ -178,7 +178,7 @@ abstract class StringConversionSinkMixin implements StringConversionSink {
   void addSlice(String str, int start, int end, bool isLast);
   void close();
 
-  void add(String str) => addSlice(str, 0, str.length, false);
+  void add(String str) { addSlice(str, 0, str.length, false); }
 
   ByteConversionSink asUtf8Sink(bool allowMalformed) {
     return new _Utf8ConversionSink(this, allowMalformed);
@@ -208,7 +208,7 @@ class _StringSinkConversionSink extends StringConversionSinkBase {
     if (isLast) close();
   }
 
-  void add(String str) => _stringSink.write(str);
+  void add(String str) { _stringSink.write(str); }
 
   ByteConversionSink asUtf8Sink(bool allowMalformed) {
     return new _Utf8StringSinkAdapter(this, _stringSink, allowMalformed);
@@ -254,7 +254,7 @@ class _StringAdapterSink extends StringConversionSinkBase {
 
   _StringAdapterSink(this._sink);
 
-  void add(String str) => _sink.add(str);
+  void add(String str) { _sink.add(str); }
 
   void addSlice(String str, int start, int end, bool isLast) {
     if (start == 0 && end == str.length) {
@@ -265,7 +265,7 @@ class _StringAdapterSink extends StringConversionSinkBase {
     if (isLast) close();
   }
 
-  void close() => _sink.close();
+  void close() { _sink.close(); }
 }