Update type annotations in resolver test.

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");
@@ skipping 204 matching lines @@
       compiler.errors[0].message);
 }
 
 
 testLocalsTwo() {
   MockCompiler compiler = new MockCompiler();
   ResolverVisitor visitor = compiler.resolverVisitor();
   Node tree = parseStatement("if (true) { var a = 1; var b = 2; }");
   Element element = visitor.visit(tree);
   Expect.equals(null, element);
-  BlockScope scope = visitor.scope;
+  MethodScope scope = visitor.scope;
   Expect.equals(0, scope.elements.length);
   Expect.equals(2, map(visitor).length);
 
   List<Element> elements = map(visitor).getValues();
   Expect.notEquals(elements[0], elements[1]);
 }
 
 testLocalsThree() {
   MockCompiler compiler = new MockCompiler();
   ResolverVisitor visitor = compiler.resolverVisitor();
   Node tree = parseStatement("{ var a = 1; if (true) { a; } }");
   Element element = visitor.visit(tree);
   Expect.equals(null, element);
-  BlockScope scope = visitor.scope;
+  MethodScope scope = visitor.scope;
   Expect.equals(0, scope.elements.length);
   Expect.equals(3, map(visitor).length);
   List<Element> elements = map(visitor).getValues();
   Expect.equals(elements[0], elements[1]);
 }
 
 testLocalsFour() {
   MockCompiler compiler = new MockCompiler();
   ResolverVisitor visitor = compiler.resolverVisitor();
   Node tree = parseStatement("{ var a = 1; if (true) { var a = 1; } }");
   Element element = visitor.visit(tree);
   Expect.equals(null, element);
-  BlockScope scope = visitor.scope;
+  MethodScope scope = visitor.scope;
   Expect.equals(0, scope.elements.length);
   Expect.equals(2, map(visitor).length);
   List<Element> elements = map(visitor).getValues();
   Expect.notEquals(elements[0], elements[1]);
 }
 
 testLocalsFive() {
   MockCompiler compiler = new MockCompiler();
   ResolverVisitor visitor = compiler.resolverVisitor();
   If tree = parseStatement("if (true) { var a = 1; a; } else { var a = 2; a;}");
   Element element = visitor.visit(tree);
   Expect.equals(null, element);
-  BlockScope scope = visitor.scope;
+  MethodScope scope = visitor.scope;
   Expect.equals(0, scope.elements.length);
   Expect.equals(6, map(visitor).length);
 
   Block thenPart = tree.thenPart;
   List statements1 = thenPart.statements.nodes.toList();
   Node def1 = statements1[0].definitions.nodes.head;
   Node id1 = statements1[1].expression;
   Expect.equals(visitor.mapping[def1], visitor.mapping[id1]);
 
   Block elsePart = tree.elsePart;
@@ skipping 25 matching lines @@
   Expect.equals(ElementKind.PARAMETER, visitor.mapping[use].kind);
   Expect.equals(visitor.mapping[param], visitor.mapping[use]);
 }
 
 testFor() {
   MockCompiler compiler = new MockCompiler();
   ResolverVisitor visitor = compiler.resolverVisitor();
   For tree = parseStatement("for (int i = 0; i < 10; i = i + 1) { i = 5; }");
   visitor.visit(tree);
 
-  BlockScope scope = visitor.scope;
+  MethodScope scope = visitor.scope;
   Expect.equals(0, scope.elements.length);
   Expect.equals(10, map(visitor).length);
 
   VariableDefinitions initializer = tree.initializer;
   Node iNode = initializer.definitions.nodes.head;
   Element iElement = visitor.mapping[iNode];
 
   // Check that we have the expected nodes. This test relies on the mapping
   // field to be a linked hash map (preserving insertion order).
   Expect.isTrue(map(visitor) is LinkedHashMap);
@@ skipping 442 matching lines @@
   Expect.isNotNull(indexedOperator);
   Expect.isNotNull(
       compiler.enqueuer.resolution.getCachedElements(indexedOperator));
 
   Element indexedSetOperator = findElement(compiler, 'C')
       .lookupLocalMember(operatorName('[]='));
   Expect.isNotNull(indexedOperator);
   Expect.isNotNull(
       compiler.enqueuer.resolution.getCachedElements(indexedSetOperator));
 }