Revert r1380 that is breaking frog.

runtime/vm/class_finalizer_test.cc

Index: runtime/vm/class_finalizer_test.cc
===================================================================
--- runtime/vm/class_finalizer_test.cc	(revision 1381)
+++ runtime/vm/class_finalizer_test.cc	(working copy)
@@ -22,29 +22,27 @@
 
 
 TEST_CASE(ClassFinalizer) {
-  ClassFinalizer::ExpectClassesToFinalize();
   GrowableArray<const Class*> classes_1;
   classes_1.Add(&Class::ZoneHandle(CreateTestClass("BMW")));
   classes_1.Add(&Class::ZoneHandle(CreateTestClass("Porsche")));
-  ClassFinalizer::AddClassesToFinalize(classes_1);
+  ClassFinalizer::AddPendingClasses(classes_1);
   GrowableArray<const Class*> classes_2;
   classes_2.Add(&Class::ZoneHandle(CreateTestClass("Ferrari")));
   classes_2.Add(&Class::ZoneHandle(CreateTestClass("Fiat")));
   classes_2.Add(&Class::ZoneHandle(CreateTestClass("Alfa")));
-  ClassFinalizer::AddClassesToFinalize(classes_2);
-  EXPECT(ClassFinalizer::FinalizeAllClasses());
+  ClassFinalizer::AddPendingClasses(classes_2);
+  EXPECT(ClassFinalizer::FinalizePendingClasses());
   for (int i = 0; i < classes_1.length(); i++) {
     EXPECT(classes_1[i]->is_finalized());
   }
   for (int i = 0; i < classes_2.length(); i++) {
     EXPECT(classes_2[i]->is_finalized());
   }
-  EXPECT(ClassFinalizer::FinalizeAllClasses());
+  EXPECT(ClassFinalizer::FinalizePendingClasses());
 }
 
 
 TEST_CASE(ClassFinalize_Cycles) {
-  ClassFinalizer::ExpectClassesToFinalize();
   GrowableArray<const Class*> classes;
   classes.Add(&Class::ZoneHandle(CreateTestClass("Jungfrau")));
   classes.Add(&Class::ZoneHandle(CreateTestClass("Eiger")));
@@ -53,8 +51,8 @@
       Type::Handle(Type::NewNonParameterizedType(*classes[1])));
   classes[1]->set_super_type(
       Type::Handle(Type::NewNonParameterizedType(*classes[0])));
-  ClassFinalizer::AddClassesToFinalize(classes);
-  EXPECT(!ClassFinalizer::FinalizeAllClasses());
+  ClassFinalizer::AddPendingClasses(classes);
+  EXPECT(!ClassFinalizer::FinalizePendingClasses());
 }
 
 
@@ -65,7 +63,6 @@
 
 
 TEST_CASE(ClassFinalize_Resolve) {
-  ClassFinalizer::ExpectClassesToFinalize();
   GrowableArray<const Class*> classes;
   Class& rhb = Class::ZoneHandle(CreateTestClass("RhB"));
   Class& sbb = Class::ZoneHandle(CreateTestClass("SBB"));
@@ -80,8 +77,8 @@
   TypeArguments& type_arguments = TypeArguments::Handle();
   rhb.set_super_type(Type::Handle(Type::NewParameterizedType(
       Object::Handle(unresolved.raw()), type_arguments)));
-  ClassFinalizer::AddClassesToFinalize(classes);
-  EXPECT(ClassFinalizer::FinalizeAllClasses());
+  ClassFinalizer::AddPendingClasses(classes);
+  EXPECT(ClassFinalizer::FinalizePendingClasses());
 }
 
 }  // namespace dart