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

tests/compiler/dart2js/deprecated_features_test.dart

Index: tests/compiler/dart2js/deprecated_features_test.dart
diff --git a/tests/compiler/dart2js/deprecated_features_test.dart b/tests/compiler/dart2js/deprecated_features_test.dart
index 3ca046e1c59cbc594ef48cf3d662097593c1e0c3..3d0a12e91c26abdf7126773364d3c6231bf3936d 100644
--- a/tests/compiler/dart2js/deprecated_features_test.dart
+++ b/tests/compiler/dart2js/deprecated_features_test.dart
@@ -6,7 +6,6 @@
 
 import "package:expect/expect.dart";
 import 'dart:async';
-import 'dart:uri';
 
 import '../../../sdk/lib/_internal/compiler/compiler.dart';
 import '../../utils/dummy_compiler_test.dart' as dummy;
@@ -35,9 +34,9 @@ main() {
   }
 
   String code = deprecatedFutureValue(
-      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));
   if (code == null) {
     throw 'Compilation failed: ${messages}';