Less inequivalence on Hello World!

tests/compiler/dart2js/type_checker_test.dart

 // Copyright (c) 2011, 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 'dart:async';
 
 import 'package:async_helper/async_helper.dart';
 import 'package:expect/expect.dart';
 
 import 'package:compiler/src/elements/resolution_types.dart';
@@ skipping 2648 matching lines @@
 
 Future setup(test(MockCompiler compiler)) {
   MockCompiler compiler =
       new MockCompiler.internal(coreSource: ALT_SOURCE, enableAsyncAwait: true);
   return compiler.init("import 'dart:async';").then((_) => test(compiler));
 }
 
 ResolutionDartType analyzeType(MockCompiler compiler, String text) {
   var node = parseExpression(text);
   TypeCheckerVisitor visitor = new TypeCheckerVisitor(
-      compiler, new TreeElementMapping(null), compiler.types);
+      compiler, new TreeElementMapping(null), compiler.resolution.types);
   return visitor.analyze(node);
 }
 
 analyzeTopLevel(String text, [expectedWarnings]) {
   if (expectedWarnings == null) expectedWarnings = [];
   if (expectedWarnings is! List) expectedWarnings = [expectedWarnings];
 
   MockCompiler compiler = new MockCompiler.internal(enableAsyncAwait: true);
   compiler.diagnosticHandler = createHandler(compiler, text);
 
@@ skipping 23 matching lines @@
           }
         });
       } else {
         node = element.parseNode(compiler.parsingContext);
         compiler.resolver.resolve(element);
         mapping = element.treeElements;
       }
     }
     // Type check last class declaration or member.
     TypeCheckerVisitor checker =
-        new TypeCheckerVisitor(compiler, mapping, compiler.types);
+        new TypeCheckerVisitor(compiler, mapping, compiler.resolution.types);
     DiagnosticCollector collector = compiler.diagnosticCollector;
     collector.clear();
     checker.analyze(node, mustHaveType: false);
     compareWarningKinds(text, expectedWarnings, collector.warnings);
 
     compiler.diagnosticHandler = null;
   });
 }
 
 /**
@@ skipping 16 matching lines @@
       new NodeListener(const ScannerOptions(), compiler.reporter, null);
   Parser parser = new Parser(listener);
   parser.parseStatement(tokens);
   Node node = listener.popNode();
   Element compilationUnit = new CompilationUnitElementX(
       new Script(null, null, null), compiler.mainApp);
   Element function = new MockElement(compilationUnit);
   TreeElements elements = compiler.resolveNodeStatement(node, function);
   compiler.enqueuer.resolution.emptyDeferredQueueForTesting();
   TypeCheckerVisitor checker =
-      new TypeCheckerVisitor(compiler, elements, compiler.types);
+      new TypeCheckerVisitor(compiler, elements, compiler.resolution.types);
   DiagnosticCollector collector = compiler.diagnosticCollector;
   collector.clear();
   checker.analyze(node, mustHaveType: false);
   if (flushDeferred) {
     compiler.enqueuer.resolution.emptyDeferredQueueForTesting();
   }
   compareWarningKinds(text, warnings, collector.warnings);
   compareWarningKinds(text, errors, collector.errors);
   if (hints != null) compareWarningKinds(text, hints, collector.hints);
   if (infos != null) compareWarningKinds(text, infos, collector.infos);
@@ skipping 20 matching lines @@
   compiler.resolver.resolve(element);
   Token tokens = scan(text);
   NodeListener listener =
       new NodeListener(const ScannerOptions(), compiler.reporter, null);
   Parser parser = new Parser(listener)
     ..asyncState = element.asyncMarker.asyncParserState;
   parser.parseStatement(tokens);
   Node node = listener.popNode();
   TreeElements elements = compiler.resolveNodeStatement(node, element);
   TypeCheckerVisitor checker =
-      new TypeCheckerVisitor(compiler, elements, compiler.types);
+      new TypeCheckerVisitor(compiler, elements, compiler.resolution.types);
   DiagnosticCollector collector = compiler.diagnosticCollector;
   collector.clear();
   checker.analyze(node, mustHaveType: false);
   generateOutput(compiler, text);
   compareWarningKinds(text, warnings, collector.warnings);
   compareWarningKinds(text, hints, collector.hints);
 }