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

tests/compiler/dart2js/parser_helper.dart

Index: tests/compiler/dart2js/parser_helper.dart
diff --git a/tests/compiler/dart2js/parser_helper.dart b/tests/compiler/dart2js/parser_helper.dart
index 3ba38e91c6a4c8134fe6b60481bd6dd4fadf1190..4b4c762aed27359502d03e4ff5cf0cb772a6a770 100644
--- a/tests/compiler/dart2js/parser_helper.dart
+++ b/tests/compiler/dart2js/parser_helper.dart
@@ -5,7 +5,6 @@
 library parser_helper;
 
 import "package:expect/expect.dart";
-import "dart:uri";
 
 import "../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart";
 import "../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart";
@@ -43,7 +42,7 @@ Node parseBodyCode(String text, Function parseMethod,
   if (diagnosticHandler == null) diagnosticHandler = new LoggerCanceler();
   Script script =
       new Script(
-          new Uri.fromComponents(scheme: "source"),
+          new Uri(scheme: "source"),
           new MockFile(text));
   LibraryElement library = new LibraryElementX(script);
   library.canUseNative = true;
@@ -84,8 +83,7 @@ Link<Element> parseUnit(String text, Compiler compiler,
                         LibraryElement library,
                         [void registerSource(Uri uri, String source)]) {
   Token tokens = scan(text);
-  Uri uri =
-      new Uri.fromComponents(scheme: "source", path: '${++sourceCounter}');
+  Uri uri = new Uri(scheme: "source", path: '${++sourceCounter}');
   if (registerSource != null) {
     registerSource(uri, text);
   }