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

tests/compiler/dart2js/parser_helper.dart

 // Copyright (c) 2012, 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.
 
 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";
 import "../../../sdk/lib/_internal/compiler/implementation/scanner/scannerlib.dart";
 import "../../../sdk/lib/_internal/compiler/implementation/source_file.dart";
 import "../../../sdk/lib/_internal/compiler/implementation/util/util.dart";
 
 import "../../../sdk/lib/_internal/compiler/implementation/elements/modelx.dart"
     show CompilationUnitElementX,
          LibraryElementX;
@@ skipping 17 matching lines @@
 }
 
 Token scan(String text) => new StringScanner(text).tokenize();
 
 Node parseBodyCode(String text, Function parseMethod,
                    {DiagnosticListener diagnosticHandler}) {
   Token tokens = scan(text);
   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;
   NodeListener listener =
       new NodeListener(diagnosticHandler, library.entryCompilationUnit);
   Parser parser = new Parser(listener);
   Token endToken = parseMethod(parser, tokens);
   assert(endToken.kind == EOF_TOKEN);
   Node node = listener.popNode();
   Expect.isNotNull(node);
@@ skipping 20 matching lines @@
   MockFile(text)
       : super('<string>', text);
 }
 
 var sourceCounter = 0;
 
 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);
   }
   var script = new Script(uri, new MockFile(text));
   var unit = new CompilationUnitElementX(script, library);
   int id = 0;
   ElementListener listener = new ElementListener(compiler, unit, () => id++);
   PartialParser parser = new PartialParser(listener);
   compiler.withCurrentElement(unit, () => parser.parseUnit(tokens));
   return unit.localMembers;
 }
 
 NodeList fullParseUnit(String source, {DiagnosticListener diagnosticHandler}) {
   return parseBodyCode(source, (parser, tokens) => parser.parseUnit(tokens),
                        diagnosticHandler: diagnosticHandler);
 }
 
 // TODO(ahe): We define this method to avoid having to import
 // the scanner in the tests. We should move SourceString to another
 // location instead.
 SourceString buildSourceString(String name) {
   return new SourceString(name);
 }