ImportElement/ExportElement 'uri' should be the selected URI.

pkg/analyzer/lib/src/dart/element/builder.dart

 // Copyright (c) 2014, 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 analyzer.src.dart.element.builder;
 
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
@@ skipping 164 matching lines @@
     // directive was invalid.
     LibraryElement exportedLibrary = exportLibraryMap[exportedSource];
     if (exportedLibrary != null) {
       ExportElementImpl exportElement = new ExportElementImpl(node.offset);
       exportElement.metadata = _getElementAnnotations(node.metadata);
       StringLiteral uriLiteral = node.uri;
       if (uriLiteral != null) {
         exportElement.uriOffset = uriLiteral.offset;
         exportElement.uriEnd = uriLiteral.end;
       }
-      exportElement.uri = node.uriContent;
+      exportElement.uri = node.selectedUri;
       exportElement.combinators = _buildCombinators(node);
       exportElement.exportedLibrary = exportedLibrary;
       setElementDocumentationComment(exportElement, node);
       node.element = exportElement;
       exports.add(exportElement);
       if (exportedTime >= 0 &&
           exportSourceKindMap[exportedSource] != SourceKind.LIBRARY) {
         int offset = node.offset;
         int length = node.length;
         if (uriLiteral != null) {
@@ skipping 24 matching lines @@
       if (importedLibrary.isDartCore) {
         explicitlyImportsCore = true;
       }
       ImportElementImpl importElement = new ImportElementImpl(node.offset);
       importElement.metadata = _getElementAnnotations(node.metadata);
       StringLiteral uriLiteral = node.uri;
       if (uriLiteral != null) {
         importElement.uriOffset = uriLiteral.offset;
         importElement.uriEnd = uriLiteral.end;
       }
-      importElement.uri = node.uriContent;
+      importElement.uri = node.selectedUri;
       importElement.deferred = node.deferredKeyword != null;
       importElement.combinators = _buildCombinators(node);
       importElement.importedLibrary = importedLibrary;
       setElementDocumentationComment(importElement, node);
       SimpleIdentifier prefixNode = node.prefix;
       if (prefixNode != null) {
         importElement.prefixOffset = prefixNode.offset;
         String prefixName = prefixNode.name;
         PrefixElementImpl prefix = nameToPrefixMap[prefixName];
         if (prefix == null) {
@@ skipping 1215 matching lines @@
     return null;
   }
 
   /**
    * Return the lexical identifiers associated with the given [identifiers].
    */
   static List<String> _getIdentifiers(NodeList<SimpleIdentifier> identifiers) {
     return identifiers.map((identifier) => identifier.name).toList();
   }
 }