Re-land r13557 on behalf of Alexander.

tests/compiler/dart2js/resolver_test.dart

 // Copyright (c) 2012, 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:uri');
 
 #import("../../../lib/compiler/implementation/leg.dart");
 #import("../../../lib/compiler/implementation/elements/elements.dart");
 #import("../../../lib/compiler/implementation/tree/tree.dart");
 #import("../../../lib/compiler/implementation/scanner/scannerlib.dart");
+#import("../../../lib/compiler/implementation/universe/universe.dart");
 #import("../../../lib/compiler/implementation/util/util.dart");
 #import("compiler_helper.dart");
 #import("mock_compiler.dart");
 #import("parser_helper.dart");
 
 Node buildIdentifier(String name) => new Identifier(scan(name));
 
 Node buildInitialization(String name) =>
   parseBodyCode('$name = 1',
       (parser, tokens) => parser.parseOptionallyInitializedIdentifier(tokens));
@@ skipping 535 matching lines @@
                    String constructor, int expectedElementCount,
                    [List expectedWarnings = const [],
                     List expectedErrors = const [],
                     String corelib = DEFAULT_CORELIB]) {
   MockCompiler compiler = new MockCompiler(corelib);
   compiler.parseScript(script);
   compiler.resolveStatement(statement);
   ClassElement classElement =
       compiler.mainApp.find(buildSourceString(className));
   Element element =
-      classElement.lookupConstructor(buildSourceString(constructor));
+      classElement.lookupConstructor(
+          new Selector.callConstructor(buildSourceString(constructor),
+                                       classElement.getLibrary()));
   FunctionExpression tree = element.parseNode(compiler);
   ResolverVisitor visitor = new ResolverVisitor(compiler, element);
   new InitializerResolver(visitor).resolveInitializers(element, tree);
   visitor.visit(tree.body);
   Expect.equals(expectedElementCount, map(visitor).length);
 
   compareWarningKinds(script, expectedWarnings, compiler.warnings);
   compareWarningKinds(script, expectedErrors, compiler.errors);
 }
 
@@ skipping 79 matching lines @@
                 A() : foo();
               }""";
   resolveConstructor(script, "A a = new A();", "A", "A", 0,
                      [], [MessageKind.CONSTRUCTOR_CALL_EXPECTED]);
 
   script = """class A {
                 int i;
                 A.a() : this.b(0);
                 A.b(int i);
               }""";
-  resolveConstructor(script, "A a = new A.a();", "A", r"A$a", 1,
+  resolveConstructor(script, "A a = new A.a();", "A", "a", 1,
                      [], []);
 
   script = """class A {
                 int i;
                 A.a() : i = 42, this(0);
                 A(int i);
               }""";
-  resolveConstructor(script, "A a = new A.a();", "A", r"A$a", 2,
+  resolveConstructor(script, "A a = new A.a();", "A", "a", 2,
                      [], [MessageKind.REDIRECTING_CONSTRUCTOR_HAS_INITIALIZER]);
 
   script = """class A {
                 int i;
                 A(i);
               }
               class B extends A {
                 B() : super(0);
               }""";
   resolveConstructor(script, "B a = new B();", "B", "B", 1,
@@ skipping 97 matching lines @@
         var d = new D();
         --d;
       }""";
   final compiler = compileScript(script);
 
   checkMemberResolved(compiler, 'A', operatorName('+', false));
   checkMemberResolved(compiler, 'B', operatorName('+', false));
   checkMemberResolved(compiler, 'C', operatorName('-', false));
   checkMemberResolved(compiler, 'D', operatorName('-', false));
 }