Revert "Reduce use of getClosureInfoForMember and cleanup closure_test"

pkg/compiler/lib/src/closure.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 'common/names.dart' show Identifiers;
 import 'common/resolution.dart' show ParsingContext, Resolution;
 import 'common/tasks.dart' show CompilerTask, Measurer;
 import 'common.dart';
 import 'compiler.dart' show Compiler;
 import 'constants/expressions.dart';
@@ skipping 28 matching lines @@
 /// to preserve Dart semantics when compiled to JavaScript. Given a particular
 /// node to look up, it returns a information about the internal representation
 /// of how closure conversion is implemented. T is an ir.Node or Node.
 abstract class ClosureDataLookup<T> {
   /// Look up information about the variables that have been mutated and are
   /// used inside the scope of [node].
   ScopeInfo getScopeInfo(MemberEntity member);
 
   /// This returns the same information as ScopeInfo, but can be called in
   /// situations when you are sure you are dealing with a closure specifically.
-  // TODO(johnniwinther,efortuna): Remove the need for this. It is now only
-  // used in inference.
+  // TODO(johnniwinther,efortuna): Can we use [getScopeInfo] instead?
   ClosureRepresentationInfo getClosureInfoForMember(MemberEntity member);
 
   ClosureRepresentationInfo getClosureInfo(T localFunction);
 
+  ClosureRepresentationInfo getClosureInfoForMemberTesting(MemberEntity member);
+
+  ClosureRepresentationInfo getClosureInfoForTesting(T localFunction);
+
   /// Look up information about a loop, in case any variables it declares need
   /// to be boxed/snapshotted.
   CapturedLoopScope getCapturedLoopScope(T loopNode);
 
   /// Accessor to the information about scopes that closures capture. Used by
   /// the SSA builder.
   CapturedScope getCapturedScope(MemberEntity entity);
 }
 
 /// Class that represents one level of scoping information, whether this scope
@@ skipping 224 matching lines @@
   }
 
   ClosureRepresentationInfo getClosureInfoForMember(MemberEntity member) {
     return _getMemberMapping(member);
   }
 
   ClosureRepresentationInfo getClosureInfo(covariant FunctionExpression node) {
     return _getClosureMapping(node);
   }
 
+  ClosureRepresentationInfo getClosureInfoForMemberTesting(
+      MemberEntity member) {
+    return getClosureInfoForMember(member);
+  }
+
+  ClosureRepresentationInfo getClosureInfoForTesting(
+      covariant FunctionExpression node) {
+    return getClosureInfo(node);
+  }
+
   CapturedLoopScope getCapturedLoopScope(Node loopNode) {
     var value = _closureInfoMap[loopNode];
     return value == null ? const CapturedLoopScope() : value;
   }
 
   /// Returns the [ClosureClassMap] computed for [element].
   ClosureClassMap _getMemberMapping(MemberElement element) {
     return measure(() {
       if (element.isGenerativeConstructorBody) {
         ConstructorBodyElement constructorBody = element;
@@ skipping 1243 matching lines @@
 ///
 /// Move the below classes to a JS model eventually.
 ///
 abstract class JSEntity implements MemberEntity {
   Local get declaredEntity;
 }
 
 abstract class PrivatelyNamedJSEntity implements JSEntity {
   Entity get rootOfScope;
 }