Change MirrorSystem.libraries to Map<Uri, String>

tests/compiler/dart2js/mirrors_test.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.
 
 import "package:expect/expect.dart";
 import '../../../sdk/lib/_internal/compiler/implementation/mirrors/mirrors.dart';
 import '../../../sdk/lib/_internal/compiler/implementation/mirrors/mirrors_util.dart';
 import '../../../sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart';
 
 import 'dart:io';
+import 'dart:uri';
+
+const Uri DART_MIRRORS_URI =
+  const Uri.fromComponents(scheme: 'dart', path: 'mirrors');
 
 int count(Iterable iterable) {
   var count = 0;
   for (var element in iterable) {
     count++;
   }
   return count;
 }
 
 bool containsType(TypeMirror expected, Iterable<TypeMirror> iterable) {
   for (var element in iterable) {
     if (element.originalDeclaration == expected.originalDeclaration) {
       return true;
     }
   }
   return false;
 }
 
-DeclarationMirror findMirror(List<DeclarationMirror> list, String name) {
+DeclarationMirror findMirror(Iterable<DeclarationMirror> list, String name) {
   for (DeclarationMirror mirror in list) {
     if (mirror.simpleName == name) {
       return mirror;
     }
   }
   return null;
 }
 
 main() {
   var scriptPath = new Path(new Options().script);
   var dirPath = scriptPath.directoryPath;
   var libPath = dirPath.join(new Path('../../../sdk/'));
   var inputPath = dirPath.join(new Path('mirrors_helper.dart'));
   var result = analyze([inputPath], libPath,
                        options: <String>['--preserve-comments']);
   result.then((MirrorSystem mirrors) {
     test(mirrors);
   });
 }
 
 void test(MirrorSystem mirrors) {
   Expect.isNotNull(mirrors, "No mirror system returned from compilation");
 
   var libraries = mirrors.libraries;
   Expect.isNotNull(libraries, "No libraries map returned");
   Expect.isFalse(libraries.isEmpty, "Empty libraries map returned");
 
-  var helperLibrary = libraries["mirrors_helper"];
+  var helperLibrary = findMirror(libraries.values, "mirrors_helper");
   Expect.isNotNull(helperLibrary, "Library 'mirrors_helper' not found");
   Expect.stringEquals("mirrors_helper", helperLibrary.simpleName,
     "Unexpected library simple name");
   Expect.stringEquals("mirrors_helper", helperLibrary.qualifiedName,
     "Unexpected library qualified name");
+  Expect.equals(helperLibrary, mirrors.findLibrary('mirrors_helper').single);
 
   var helperLibraryLocation = helperLibrary.location;
   Expect.isNotNull(helperLibraryLocation);
   Expect.equals(271, helperLibraryLocation.offset, "Unexpected offset");
   Expect.equals(23, helperLibraryLocation.length, "Unexpected length");
   Expect.equals(9, helperLibraryLocation.line, "Unexpected line");
   Expect.equals(1, helperLibraryLocation.column, "Unexpected column");
 
 
   var classes = helperLibrary.classes;
@@ skipping 101 matching lines @@
   //////////////////////////////////////////////////////////////////////////////
   // Metadata tests
   //////////////////////////////////////////////////////////////////////////////
 
   var metadataList = fooClass.metadata;
   Expect.isNotNull(metadataList);
   Expect.equals(16, metadataList.length);
   var metadataListIndex = 0;
   var metadata;
 
-  var dartMirrorsLibrary = system.libraries['dart.mirrors'];
+  var dartMirrorsLibrary = system.libraries[DART_MIRRORS_URI];
   Expect.isNotNull(dartMirrorsLibrary);
   var commentType = dartMirrorsLibrary.classes['Comment'];
   Expect.isNotNull(commentType);
 
   // /// Singleline doc comment.
   metadata = metadataList[metadataListIndex++];
   Expect.isTrue(metadata is InstanceMirror);
   Expect.isFalse(metadata.hasReflectee);
   Expect.throws(() => metadata.reflectee, (_) => true);
   Expect.isTrue(metadata is CommentInstanceMirror);
@@ skipping 852 matching lines @@
   Expect.isTrue(privateFactoryConstructor.isPrivate);
   Expect.isFalse(privateFactoryConstructor.isConstConstructor);
   Expect.isFalse(privateFactoryConstructor.isRedirectingConstructor);
   Expect.isFalse(privateFactoryConstructor.isGenerativeConstructor);
   Expect.isTrue(privateFactoryConstructor.isFactoryConstructor);
 
   var metadata = privateClass.metadata;
   Expect.isNotNull(metadata);
   Expect.equals(0, metadata.length);
 }