Revert "Distinguish between actual closure scopes and non-closure scopes."

tests/compiler/dart2js/closure/closure_test.dart

 // Copyright (c) 2017, 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:io';
 import 'package:async_helper/async_helper.dart';
 import 'package:compiler/src/closure.dart';
 import 'package:compiler/src/common.dart';
 import 'package:compiler/src/compiler.dart';
 import 'package:compiler/src/diagnostics/diagnostic_listener.dart';
@@ skipping 77 matching lines @@
   String computeElementValue(AstElement element) {
     // TODO(johnniwinther,efortuna): Collect data for the member
     // (has thisLocal, has box, etc.).
     return null;
   }
 }
 
 /// Kernel IR visitor for computing closure data.
 class ClosureIrChecker extends AbstractIrComputer {
   final ClosureDataLookup<ir.Node> closureDataLookup;
-  final ScopeInfo info;
+  final ClosureRepresentationInfo info;
   final KernelToLocalsMap _localsMap;
 
   ClosureIrChecker(
       Map<Id, String> actualMap,
       Map<Id, SourceSpan> sourceSpanMap,
       KernelToElementMapForBuilding elementMap,
       MemberEntity member,
       this._localsMap,
       this.closureDataLookup)
-      : this.info = closureDataLookup.getScopeInfo(member),
+      : this.info = closureDataLookup.getClosureRepresentationInfo(member),
         super(actualMap, sourceSpanMap);
 
   @override
   String computeNodeValue(ir.Node node) {
     if (node is ir.VariableDeclaration) {
       Local local = _localsMap.getLocal(node);
       return computeLocalValue(info, local);
     }
     // TODO(johnniwinther,efortuna): Collect data for other nodes?
     return null;
   }
 
   @override
   String computeMemberValue(ir.Member member) {
     // TODO(johnniwinther,efortuna): Collect data for the member
     // (has thisLocal, has box, etc.).
     return null;
   }
 }
 
 /// Compute a string representation of the data stored for [local] in [info].
-String computeLocalValue(ScopeInfo info, Local local) {
+String computeLocalValue(ClosureRepresentationInfo info, Local local) {
   StringBuffer sb = new StringBuffer();
   if (info.localIsUsedInTryOrSync(local)) {
     sb.write('inTry');
   }
   // TODO(johnniwinther,efortuna): Add more info (captured, boxed etc.).
   return sb.toString();
 }