Revert r1380 that is breaking frog.

runtime/vm/class_finalizer.h

Index: runtime/vm/class_finalizer.h
===================================================================
--- runtime/vm/class_finalizer.h	(revision 1381)
+++ runtime/vm/class_finalizer.h	(working copy)
@@ -12,13 +12,11 @@
 
 class Class;
 class Function;
-class RawClass;
 class RawType;
 class Script;
 class String;
 class Type;
 class TypeArguments;
-class UnresolvedClass;
 
 // Traverses all pending, unfinalized classes, validates and marks them as
 // finalized.
@@ -38,26 +36,17 @@
   // Set the error message on failure (to String::null() if no error).
   static RawType* FinalizeAndCanonicalizeType(const Type& type, String* errmsg);
 
-  // Notify finalizer to expect classes to be finalized.
-  static void ExpectClassesToFinalize();
+  // Pending classes are classes that need to be finalized.
+  static void AddPendingClasses(const GrowableArray<const Class*>& classes);
 
-  // Return true after a call to ExpectClassesToFinalize() and before a call to
-  // FinalizeAllClasses().
-  static bool IsExpectingClassesToFinalize();
+  // Return false if we still have classes pending to be finalized.
+  static bool AllClassesFinalized();
 
-  // Add given classes to the list of pending classes to be finalized.
-  // ExpectClassesToFinalize() must be called prior to AddClassesToFinalize().
-  static void AddClassesToFinalize(const GrowableArray<const Class*>& classes);
-
-  // Return false if we still have classes pending to be finalized or expecting
-  // more classes to be finalized.
-  static bool AllClassesFinalized() { return !IsExpectingClassesToFinalize(); }
-
   // Return whether class finalization failed.
   // The function returns true if the finalization was successful.
   // If finalization fails, an error message is set in the sticky error field
   // in the object store.
-  static bool FinalizeAllClasses();
+  static bool FinalizePendingClasses();
 
   // Verify that the pending classes have been properly prefinalized. This is
   // needed during bootstrapping where the classes have been preloaded.
@@ -67,8 +56,6 @@
   static void FinalizeClass(const Class& cls);
   static bool IsSuperCycleFree(const Class& cls);
   static void CheckForLegalConstClass(const Class& cls);
-  static RawClass* ResolveClass(const Class& cls,
-                                const UnresolvedClass& unresolved_class);
   static void ResolveSuperClass(const Class& cls);
   static void ResolveDefaultClass(const Class& cls);
   static void ResolveInterfaces(const Class& cls,
@@ -77,7 +64,6 @@
                                     const TypeArguments& arguments);
   static RawType* ResolveType(const Class& cls, const Type& type);
   static RawType* FinalizeType(const Type& type);
-  static void ResolveAndFinalizeUpperBounds(const Class& cls);
   static void ResolveAndFinalizeSignature(const Class& cls,
                                           const Function& function);
   static void ResolveAndFinalizeMemberTypes(const Class& cls);