Revert "Refactoring resolution of local access and unqualified access of statics"

tests/compiler/dart2js/simple_inferrer_test.dart

 // Copyright (c) 2013, 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 "package:async_helper/async_helper.dart";
 import 'package:compiler/src/types/types.dart' show TypeMask;
 import 'type_mask_test_helper.dart';
 
 import 'compiler_helper.dart';
@@ skipping 600 matching lines @@
   var a, b;
   var i = 0;
 }
 
 main() {
   // Ensure a function class is being instantiated.
   () => 42;
   returnNum1(true);
   returnNum2(true);
   returnInt1(true);
-  returnInt2();
+  returnInt2(true);
   returnInt3(true);
   returnInt4();
   returnDouble(true);
   returnGiveUp(true);
   returnInt5();
   returnInt6();
   returnInt7();
   returnInt8();
   returnIntOrNull(true);
   returnDynamic();
@@ skipping 28 matching lines @@
   testIsCheck27(topLevelGetter());
   testIsCheck28(topLevelGetter());
   testIsCheck29(topLevelGetter());
   testIf1(topLevelGetter());
   testIf2(topLevelGetter());
   returnAsString();
   returnIntAsNum();
   returnAsTypedef();
   returnTopLevelGetter();
   testDeadCode();
-  testLabeledIf(true);
+  testLabeledIf();
   testSwitch1();
   testSwitch2();
   testSwitch3();
   testSwitch4();
   testSwitch5();
   testContinue1();
   testBreak1();
   testContinue2();
   testBreak2();
   testDoWhile1();
@@ skipping 39 matching lines @@
   testReturnNull4();
   testReturnNull5();
   testReturnNull6();
   testReturnNotEquals();
 }
 """;
 
 void main() {
   Uri uri = new Uri(scheme: 'source');
   var compiler = compilerFor(TEST, uri);
-  compiler.diagnosticHandler = createHandler(compiler, TEST);
   asyncTest(() => compiler.runCompiler(uri).then((_) {
     var typesTask = compiler.typesTask;
     var typesInferrer = typesTask.typesInferrer;
     var world = compiler.world;
 
     checkReturn(String name, type) {
       var element = findElement(compiler, name);
       Expect.equals(
           type,
           simplify(typesInferrer.getReturnTypeOfElement(element), compiler),
@@ skipping 130 matching lines @@
     checkReturn('testSpecialization3', typesTask.uint31Type.nullable());
     checkReturn('testReturnNull1', typesTask.nullType);
     checkReturn('testReturnNull2', typesTask.nullType);
     checkReturn('testReturnNull3', typesTask.dynamicType);
     checkReturn('testReturnNull4', typesTask.nullType);
     checkReturn('testReturnNull5', typesTask.nullType);
     checkReturn('testReturnNull6', typesTask.dynamicType);
     checkReturn('testReturnNotEquals', typesTask.boolType);
   }));
 }