Prepare to have more than one universe.

dart/lib/compiler/implementation/scanner/scanner_task.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.
 
 class ScannerTask extends CompilerTask {
   ScannerTask(Compiler compiler) : super(compiler);
   String get name() => 'Scanner';
 
   void scan(CompilationUnitElement compilationUnit) {
     measure(() {
@@ skipping 98 matching lines @@
       throw;
     } catch (var ex) {
       compiler.unhandledExceptionOnElement(compilationUnit);
       throw;
     }
   }
 
   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);
           native.maybeEnableNative(compiler, element, uri);
           return element;
         });
     if (newLibrary) {
       compiler.withCurrentElement(library, () => scan(library));
       compiler.onLibraryLoaded(library, uri);
     }
@@ skipping 47 matching lines @@
     }
   }
 }
 
 class DietParserTask extends CompilerTask {
   DietParserTask(Compiler compiler) : super(compiler);
   final String name = 'Diet Parser';
 
   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);
       parser.parseUnit(tokens);
     });
   }
 }
 
 /**
  * The fields of this class models a state machine for checking script
  * tags come in the correct order.
  */
 class TagState {
   static final int NO_TAG_SEEN = 0;
   static final int LIBRARY = 1;
   static final int IMPORT = 2;
   static final int SOURCE = 3;
   static final int RESOURCE = 4;
 
   /** Next state. */
   static final List<int> NEXT =
       const <int>[NO_TAG_SEEN,
                   IMPORT, // Only one library tag is allowed.
                   IMPORT,
                   SOURCE,
                   RESOURCE];
 }