Refactor Library/CompilationUnit and how we define local Scope.

tests/compiler/dart2js/mock_compiler.dart

Index: tests/compiler/dart2js/mock_compiler.dart
diff --git a/tests/compiler/dart2js/mock_compiler.dart b/tests/compiler/dart2js/mock_compiler.dart
index 8694ef6b7ec80141f3c4964de7b108c03bd480fc..27f97b1bdbea57af4de992eb28408436a6ecf7e5 100644
--- a/tests/compiler/dart2js/mock_compiler.dart
+++ b/tests/compiler/dart2js/mock_compiler.dart
@@ -190,10 +190,10 @@ void compareWarningKinds(String text, expectedWarnings, foundWarnings) {
 
 void importLibrary(LibraryElement target, LibraryElement imported,
                    Compiler compiler) {
-  for (Link<Element> link = imported.topLevelElements; !link.isEmpty();
+  for (Link<Element> link = imported.localMembers; !link.isEmpty();

[Lasse Reichstein Nielsen, 2012/08/08 14:22:12]

Can you use for-in here too?

[Anders Johnsen, 2012/08/08 17:30:37]

Done.

        link = link.tail) {
     compiler.withCurrentElement(link.head, () {
-        target.define(link.head, compiler);
+        target.addToScope(link.head, compiler);
       });
   }
 }