Split inference type-info accessors into members, parameters and local functions

tests/compiler/dart2js/expect_annotations_test.dart

Index: tests/compiler/dart2js/expect_annotations_test.dart
diff --git a/tests/compiler/dart2js/expect_annotations_test.dart b/tests/compiler/dart2js/expect_annotations_test.dart
index c2b39f0a75831bf134b90523b9813de554682e18..272fe8826408e3a86dcc3945aa1ad85aea0d790d 100644
--- a/tests/compiler/dart2js/expect_annotations_test.dart
+++ b/tests/compiler/dart2js/expect_annotations_test.dart
@@ -63,15 +63,15 @@ main() {
     Expect.isNotNull(closedWorld.commonElements.expectAssumeDynamicClass,
         'AssumeDynamicClass is unresolved.');
 
-    void testTypeMatch(FunctionElement function, TypeMask expectedParameterType,
+    void testTypeMatch(MethodElement function, TypeMask expectedParameterType,
         TypeMask expectedReturnType, TypesInferrer inferrer) {
       for (ParameterElement parameter in function.parameters) {
-        TypeMask type = inferrer.getTypeOfElement(parameter);
+        TypeMask type = inferrer.getTypeOfParameter(parameter);
         Expect.equals(
             expectedParameterType, simplify(type, closedWorld), "$parameter");
       }
       if (expectedReturnType != null) {
-        TypeMask type = inferrer.getReturnTypeOfElement(function);
+        TypeMask type = inferrer.getReturnTypeOfMember(function);
         Expect.equals(
             expectedReturnType, simplify(type, closedWorld), "$function");
       }