Prepare to have more than one universe.

dart/lib/compiler/implementation/scanner/scanner_task.dart

Index: dart/lib/compiler/implementation/scanner/scanner_task.dart
diff --git a/dart/lib/compiler/implementation/scanner/scanner_task.dart b/dart/lib/compiler/implementation/scanner/scanner_task.dart
index 483704734d9b4b43d490db320038dcccda05fc67..208db232f407eb015ae13f24fe02291ef01bddc0 100644
--- a/dart/lib/compiler/implementation/scanner/scanner_task.dart
+++ b/dart/lib/compiler/implementation/scanner/scanner_task.dart
@@ -116,7 +116,7 @@ class ScannerTask extends CompilerTask {
   LibraryElement loadLibrary(Uri uri, Node node) {
     bool newLibrary = false;
     LibraryElement library =
-      compiler.universe.libraries.putIfAbsent(uri.toString(), () {
+      compiler.libraries.putIfAbsent(uri.toString(), () {
           newLibrary = true;
           Script script = compiler.readScript(uri, node);
           LibraryElement element = new LibraryElement(script);
@@ -184,7 +184,7 @@ class DietParserTask extends CompilerTask {
 
   dietParse(CompilationUnitElement compilationUnit, Token tokens) {
     measure(() {
-      Function idGenerator = compiler.universe.getNextFreeClassId;
+      Function idGenerator = compiler.getNextFreeClassId;
       ElementListener listener =
           new ElementListener(compiler, compilationUnit, idGenerator);
       PartialParser parser = new PartialParser(listener);