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

utils/testrunner/run_pipeline.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.
 
 /** The default pipeline code for running a test file. */
 library pipeline;
 import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
 import 'dart:math';
@@ skipping 139 matching lines @@
   }
 
   // Create the test controller Dart wrapper.
   var directives, extras;
 
   if (config["layout"]) {
     directives = '''
 import 'dart:async';
 import 'dart:io';
 import 'dart:math';
-import 'dart:uri';
 part '${normalizePath('${config["runnerDir"]}/layout_test_controller.dart')}';
     ''';
     extras = '''
   baseUrl = 'file://${normalizePath('$tempHtmlFile')}';
   tprint = (msg) => print('###\$msg');
   notifyDone = (e) => exit(e);
     ''';
   } else if (config["runtime"] == "vm") {
     directives = '''
 import 'dart:async';
@@ skipping 63 matching lines @@
   ''');
 
   // Create the child wrapper for layout tests.
   if (config["layout"]) {
     logMessage('Creating $tempChildDartFile');
     writeFile(tempChildDartFile, '''
 library layout_test;
 import 'dart:math';
 import 'dart:isolate';
 import 'dart:html';
-import 'dart:uri';
 import 'package:unittest/unittest.dart' as unittest;
 import '${normalizePath('$testFile')}' as test;
 part '${normalizePath('${config["runnerDir"]}/layout_test_runner.dart')}';
 
 main() {
   includeFilters = ${config["include"]};
   excludeFilters = ${config["exclude"]};
   unittest.testState["port"] = $serverPort;
   runTests(test.main);
 }
@@ skipping 105 matching lines @@
     cleanup(tempHtmlFile);
     cleanup(tempJsFile);
     cleanup(tempChildDartFile);
     cleanup(tempChildJsFile);
     cleanup(createTempName(tmpDir, "pubspec", "yaml"));
     cleanup(createTempName(tmpDir, "pubspec", "lock"));
     cleanupDir(createTempName(tmpDir, "packages"));
   }
   completePipeline(stdout, stderr, exitcode);
 }