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

pkg/analyzer_experimental/lib/src/generated/source.dart

 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library engine.source;
 
-import 'dart:uri';
 import 'java_core.dart';
 import 'sdk.dart' show DartSdk;
 import 'engine.dart' show AnalysisContext;
 
 /**
  * Instances of the class {@code SourceFactory} resolve possibly relative URI's against an existing{@link Source source}.
  * @coverage dart.engine.source
  */
 class SourceFactory {
   /**
@@ skipping 31 matching lines @@
     _jtd_constructor_333_impl(new ContentCache(), resolvers);
   }
   /**
    * Return a source object representing the given absolute URI, or {@code null} if the URI is not a
    * valid URI or if it is not an absolute URI.
    * @param absoluteUri the absolute URI to be resolved
    * @return a source object representing the absolute URI
    */
   Source forUri(String absoluteUri) {
     try {
-      Uri uri = new Uri(absoluteUri);
+      Uri uri = Uri.parse(absoluteUri);
       if (uri.isAbsolute) {
         return resolveUri2(null, uri);
       }
     } on URISyntaxException catch (exception) {
     }
     return null;
   }
   /**
    * Return a source object that is equal to the source object used to obtain the given encoding.
    * @param encoding the encoding of a source object
    * @return a source object that is described by the given encoding
    * @throws IllegalArgumentException if the argument is not a valid encoding
    * @see Source#getEncoding()
    */
   Source fromEncoding(String encoding) {
     if (encoding.length < 2) {
       throw new IllegalArgumentException("Invalid encoding length");
     }
     UriKind kind = UriKind.fromEncoding(encoding.codeUnitAt(0));
     if (kind == null) {
       throw new IllegalArgumentException("Invalid source kind in encoding: ${kind}");
     }
     try {
-      Uri uri = new Uri(encoding.substring(1));
+      Uri uri = Uri.parse(encoding.substring(1));
       for (UriResolver resolver in _resolvers) {
         Source result = resolver.fromEncoding(_contentCache, kind, uri);
         if (result != null) {
           return result;
         }
       }
       throw new IllegalArgumentException("No resolver for kind: ${kind}");
     } catch (exception) {
       throw new IllegalArgumentException("Invalid URI in encoding");
     }
@@ skipping 26 matching lines @@
   /**
    * Return a source object representing the URI that results from resolving the given (possibly
    * relative) contained URI against the URI associated with an existing source object, or{@code null} if either the contained URI is invalid or if it cannot be resolved against the
    * source object's URI.
    * @param containingSource the source containing the given URI
    * @param containedUri the (possibly relative) URI to be resolved against the containing source
    * @return the source representing the contained URI
    */
   Source resolveUri(Source containingSource, String containedUri) {
     try {
-      return resolveUri2(containingSource, new Uri(containedUri));
+      return resolveUri2(containingSource, Uri.parse(containedUri));
     } on URISyntaxException catch (exception) {
       return null;
     }
   }
   /**
    * Set the contents of the given source to the given contents. This has the effect of overriding
    * the default contents of the source. If the contents are {@code null} the override is removed so
    * that the default contents will be returned.
    * @param source the source whose contents are being overridden
    * @param contents the new contents of the source
@@ skipping 582 matching lines @@
    */
   void setContents(Source source, String contents) {
     if (contents == null) {
       _contentMap.remove(source);
       _stampMap.remove(source);
     } else {
       _contentMap[source] = contents;
       _stampMap[source] = JavaSystem.currentTimeMillis();
     }
   }
-}
+}