Merge the dart:uri library into dart:core and update the Uri class

tests/utils/recursive_import_test.dart

Index: tests/utils/recursive_import_test.dart
diff --git a/tests/utils/recursive_import_test.dart b/tests/utils/recursive_import_test.dart
index d4117077d852048e4a642bb613a1e8d567e05e76..d0d34237f9b12bc138bf8ae889f5184e263fa127 100644
--- a/tests/utils/recursive_import_test.dart
+++ b/tests/utils/recursive_import_test.dart
@@ -7,7 +7,6 @@
 import "package:expect/expect.dart";
 import 'dart:async';
 import '../../sdk/lib/_internal/compiler/compiler.dart';
-import 'dart:uri';
 
 const CORE_LIB = """
 library core;
@@ -103,9 +102,9 @@ main() {
   }
 
   Future<String> result =
-      compile(new Uri.fromComponents(scheme: 'main'),
-              new Uri.fromComponents(scheme: 'lib', path: '/'),
-              new Uri.fromComponents(scheme: 'package', path: '/'),
+      compile(new Uri(scheme: 'main'),
+              new Uri(scheme: 'lib', path: '/'),
+              new Uri(scheme: 'package', path: '/'),
               provider, handler);
   result.then((String code) {
     Expect.isNull(code);