Update dart:convert and dart:core Uri.

test/codegen_test.dart

 // Copyright (c) 2016, 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.
 
 /// Tests code generation.
 /// Runs Dart Dev Compiler on all input in the `codegen` directory and checks
 /// that the output is what we expected.
 library dev_compiler.test.codegen_test;
 
 import 'dart:convert' show JSON;
@@ skipping 23 matching lines @@
 
 main(arguments) {
   if (arguments == null) arguments = [];
   ArgResults args = argParser.parse(arguments);
   var filePattern = new RegExp(args.rest.length > 0 ? args.rest[0] : '.');
 
   var expectDir = path.join(inputDir, 'expect');
   var testDirs = [
     'language',
     'corelib',
-    path.join('lib', 'typed_data'),
-    path.join('lib', 'html')
+    path.join('lib', 'convert'),
+    path.join('lib', 'html'),
+    path.join('lib', 'typed_data')
   ];
 
   var multitests = expandMultiTests(testDirs, filePattern);
 
   // Build packages tests depend on
   var compiler = new ModuleCompiler(
       new AnalyzerOptions(customUrlMappings: packageUrlMappings));
 
   group('dartdevc package', () {
     _buildPackages(compiler, expectDir);
@@ skipping 248 matching lines @@
 /// Simplified from ParseDartTask.resolveDirective.
 String _resolveDirective(UriBasedDirective directive) {
   StringLiteral uriLiteral = directive.uri;
   String uriContent = uriLiteral.stringValue;
   if (uriContent != null) {
     uriContent = uriContent.trim();
     directive.uriContent = uriContent;
   }
   return directive.validate() == null ? uriContent : null;
 }