Consolidate duplicate code for resloving URIs.

pkg/analyzer/lib/src/summary/prelink.dart

 // Copyright (c) 2016, 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.
 
 import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer/src/generated/java_engine.dart';
 import 'package:analyzer/src/generated/source.dart';
+import 'package:analyzer/src/generated/utilities_dart.dart';
 import 'package:analyzer/src/summary/format.dart';
 import 'package:analyzer/src/summary/idl.dart';
 import 'package:analyzer/src/summary/name_filter.dart';
 
 /**
  * Create a [LinkedLibraryBuilder] corresponding to the given
  * [definingUnit], which should be the defining compilation unit for a library.
  * Compilation units referenced by the defining compilation unit via `part`
  * declarations will be retrieved using [getPart].  Public namespaces for
  * libraries referenced by the defining compilation unit via `import`
@@ skipping 485 matching lines @@
   }
 
   /**
    * Resolve [relativeUri] relative to [sourceUri].  Works correctly if
    * [sourceUri] is also relative.
    */
   String resolveUri(String sourceUri, String relativeUri) {
     if (sourceUri == null) {
       return relativeUri;
     } else {
-//      return Uri.parse(sourceUri).resolve(relativeUri).toString();
-      // TODO(paulberry): this algorithm is mostly copied from FileBasedSource.
-      // The code should be refactored so it can be shared.
-      Uri containedUri = Uri.parse(relativeUri);
-      if (containedUri.isAbsolute) {
-        return relativeUri;
-      }
-      Uri uri = Uri.parse(sourceUri);
-      try {
-        Uri baseUri = uri;
-        bool isOpaque = uri.isAbsolute && !uri.path.startsWith('/');
-        if (isOpaque) {
-          String scheme = uri.scheme;
-          String part = uri.path;
-          if (scheme == DartUriResolver.DART_SCHEME && part.indexOf('/') < 0) {
-            part = "$part/$part.dart";
-          }
-          baseUri = parseUriWithException("$scheme:/$part");
-        }
-        Uri result = baseUri.resolveUri(containedUri);
-        if (isOpaque) {
-          result = parseUriWithException(
-              "${result.scheme}:${result.path.substring(1)}");
-        }
-        //print('$sourceUri | $relativeUri -> $result');
-        return result.toString();
-      } catch (exception, stackTrace) {
-        throw new AnalysisException(
-            "Could not resolve URI ($containedUri) relative to source ($uri)",
-            new CaughtException(exception, stackTrace));
-      }
+      return resolveRelativeUri(Uri.parse(sourceUri), Uri.parse(relativeUri))
+          .toString();
     }
   }
 }