Updates from comments.

tests/compiler/dart2js/class_set_test.dart

 // Copyright (c) 2015, 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.
 
 // Test for iterators on for [SubclassNode].
 
 library class_set_test;
 
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
@@ skipping 393 matching lines @@
       visited.add(cls);
     }, ClassHierarchyNode.ALL);
 
     Expect.listEquals(expected, visited,
         "Unexpected classes on $cls.forEachSubclass:\n"
         "Actual: $visited, expected: $expected\n$classSet");
 
     visited = <ClassElement>[];
     classSet.forEachSubclass((ClassElement cls) {
       visited.add(cls);
-      return ForEach.CONTINUE;
+      return IterationStep.CONTINUE;
     }, ClassHierarchyNode.ALL);
 
     Expect.listEquals(expected, visited,
         "Unexpected classes on $cls.forEachSubclass:\n"
         "Actual: $visited, expected: $expected\n$classSet");
   }
 
   checkForEachSubclass(A, [A, B, D, C, G, F, I, H, E]);
   checkForEachSubclass(B, [B, D]);
   checkForEachSubclass(C, [C, G, F, I, H, E]);
@@ skipping 12 matching lines @@
       visited.add(cls);
     }, ClassHierarchyNode.ALL);
 
     Expect.listEquals(expected, visited,
         "Unexpected classes on $cls.forEachSubtype:\n"
         "Actual: $visited, expected: $expected\n$classSet");
 
     visited = <ClassElement>[];
     classSet.forEachSubtype((ClassElement cls) {
       visited.add(cls);
-      return ForEach.CONTINUE;
+      return IterationStep.CONTINUE;
     }, ClassHierarchyNode.ALL);
 
     Expect.listEquals(expected, visited,
         "Unexpected classes on $cls.forEachSubtype:\n"
         "Actual: $visited, expected: $expected\n$classSet");
   }
 
   checkForEachSubtype(A, [A, B, D, C, G, F, I, H, E]);
   checkForEachSubtype(B, [B, D, F, I, H, G]);
   checkForEachSubtype(C, [C, G, F, I, H, E]);
@@ skipping 13 matching lines @@
        bool forEachSubtype: false,
        EnumSet<Instantiation> mask}) {
 
     if (mask == null) {
       mask = ClassHierarchyNode.ALL;
     }
 
     ClassSet classSet = world.getClassSet(cls);
     List<ClassElement> visited = <ClassElement>[];
 
-    ForEach visit(ClassElement cls) {
+    IterationStep visit(ClassElement cls) {
       visited.add(cls);
       if (cls == stop) {
-        return ForEach.STOP;
+        return IterationStep.STOP;
       } else if (skipSubclasses.contains(cls)) {
-        return ForEach.SKIP_SUBCLASSES;
+        return IterationStep.SKIP_SUBCLASSES;
       }
-      return ForEach.CONTINUE;
+      return IterationStep.CONTINUE;
     }
 
     if (forEachSubtype) {
       classSet.forEachSubtype(visit, mask);
     } else {
       classSet.forEachSubclass(visit, mask);
     }
 
     Expect.listEquals(expected, visited,
         "Unexpected classes on $cls."
@@ skipping 76 matching lines @@
 
   checkAny(X, [X, A, B, D, C, G, F, I, H, E],
       anySubtype: true, expectedResult: false);
   checkAny(X, [X, A],
       find: A, anySubtype: true, expectedResult: true);
   checkAny(X, [X, A, B, D],
       find: D, anySubtype: true, expectedResult: true);
   checkAny(X, [X, A, B, D, C, G, F, I],
       find: I, anySubtype: true, expectedResult: true);
 }