Hopefully the last bit of restructuring between closture classes and loop boxing, etc.

tests/compiler/dart2js/serialization/model_test_helper.dart

Index: tests/compiler/dart2js/serialization/model_test_helper.dart
diff --git a/tests/compiler/dart2js/serialization/model_test_helper.dart b/tests/compiler/dart2js/serialization/model_test_helper.dart
index ec6f85e14b7cc9146fed26a245c74286a704412b..3ea5f8a355f25891af16226a26da52f5e5873ec8 100644
--- a/tests/compiler/dart2js/serialization/model_test_helper.dart
+++ b/tests/compiler/dart2js/serialization/model_test_helper.dart
@@ -255,17 +255,18 @@ bool areCapturedVariablesEquivalent(FieldEntity a, FieldEntity b) {
 bool areClosureScopesEquivalent(ClosureScope a, ClosureScope b) {
   if (a == b) return true;
   if (a == null || b == null) return false;
-  if (!areLocalsEquivalent(a.boxElement, b.boxElement)) {
+  if (!areLocalsEquivalent(a.context, b.context)) {
     return false;
   }
-  checkMaps(
-      a.capturedVariables,
-      b.capturedVariables,
-      'ClosureScope.capturedVariables',
-      areLocalsEquivalent,
+  if (!areLocalsEquivalent(a.thisLocal, b.thisLocal)) {
+    return false;
+  }
+  var aBoxed = {};
+  a.forEachBoxedVariable((k, v) => aBoxed[k] = v);
+  var bBoxed = {};
+  b.forEachBoxedVariable((k, v) => bBoxed[k] = v);
+  checkMaps(aBoxed, bBoxed, 'ClosureScope.boxedVariables', areLocalsEquivalent,
       areElementsEquivalent);
-  checkSets(a.boxedLoopVariables, b.boxedLoopVariables,
-      'ClosureScope.boxedLoopVariables', areElementsEquivalent);
   return true;
 }