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

tests/compiler/dart2js/diagnose_ambiguous_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 'memory_source_file_helper.dart';
 
 import 'package:compiler/compiler.dart'
        show Diagnostic;
@@ skipping 20 matching lines @@
                                    packageRoot,
                                    ['--analyze-only'],
                                    {});
   asyncTest(() => compiler.run(Uri.parse('memory:main.dart')).then((_) {
     diagnostics.sort();
     var expected = [
         "memory:exporter.dart:43:47:'hest' is defined here.:info",
         "memory:library.dart:41:45:'hest' is defined here.:info",
         "memory:main.dart:0:22:'hest' is imported here.:info",
         "memory:main.dart:23:46:'hest' is imported here.:info",
-        "memory:main.dart:86:92:Duplicate import of 'hest'.:error"
+        "memory:main.dart:86:90:Duplicate import of 'hest'.:error"
     ];
     Expect.listEquals(expected, diagnostics);
     Expect.isTrue(compiler.compilationFailed);
   }));
 }
 
 const Map MEMORY_SOURCE_FILES = const {
   'main.dart': """
 import 'library.dart';
 import 'exporter.dart';
@@ skipping 15 matching lines @@
 hest() {}
 """,
   'exporter.dart': """
 library exporter;
 
 export 'library.dart';
 
 hest() {}
 """,
 };