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

tests/compiler/dart2js/simple_inferrer_test.dart

Index: tests/compiler/dart2js/simple_inferrer_test.dart
diff --git a/tests/compiler/dart2js/simple_inferrer_test.dart b/tests/compiler/dart2js/simple_inferrer_test.dart
index 5999741882aea3bd0a74143a936cb8f598fc93b5..33fb4fadf6e2cd58475be3b8b3c7b751b51d8d7a 100644
--- a/tests/compiler/dart2js/simple_inferrer_test.dart
+++ b/tests/compiler/dart2js/simple_inferrer_test.dart
@@ -618,7 +618,7 @@ main() {
   returnNum1(true);
   returnNum2(true);
   returnInt1(true);
-  returnInt2();
+  returnInt2(true);
   returnInt3(true);
   returnInt4();
   returnDouble(true);
@@ -667,7 +667,7 @@ main() {
   returnAsTypedef();
   returnTopLevelGetter();
   testDeadCode();
-  testLabeledIf(true);
+  testLabeledIf();
   testSwitch1();
   testSwitch2();
   testSwitch3();
@@ -727,7 +727,6 @@ main() {
 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;