Renamed some scoping classes to make their usage clearer.

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 3ea5f8a355f25891af16226a26da52f5e5873ec8..5772f7ad2b5ad4f1a9761b085817518d3b3cee5b 100644
--- a/tests/compiler/dart2js/serialization/model_test_helper.dart
+++ b/tests/compiler/dart2js/serialization/model_test_helper.dart
@@ -252,7 +252,7 @@ bool areCapturedVariablesEquivalent(FieldEntity a, FieldEntity b) {
   return false;
 }
 
-bool areClosureScopesEquivalent(ClosureScope a, ClosureScope b) {
+bool areScopeInClosuresEquivalent(ScopeInClosure a, ScopeInClosure b) {
   if (a == b) return true;
   if (a == null || b == null) return false;
   if (!areLocalsEquivalent(a.context, b.context)) {
@@ -265,8 +265,8 @@ bool areClosureScopesEquivalent(ClosureScope a, ClosureScope b) {
   a.forEachBoxedVariable((k, v) => aBoxed[k] = v);
   var bBoxed = {};
   b.forEachBoxedVariable((k, v) => bBoxed[k] = v);
-  checkMaps(aBoxed, bBoxed, 'ClosureScope.boxedVariables', areLocalsEquivalent,
-      areElementsEquivalent);
+  checkMaps(aBoxed, bBoxed, 'ScopeInClosure.boxedVariables',
+      areLocalsEquivalent, areElementsEquivalent);
   return true;
 }