Make ClassFinalizer indifferent on whether we are generating a snapshot or not.

runtime/vm/class_finalizer.h

Index: runtime/vm/class_finalizer.h
===================================================================
--- runtime/vm/class_finalizer.h	(revision 11197)
+++ runtime/vm/class_finalizer.h	(working copy)
@@ -27,21 +27,6 @@
 // finalized.
 class ClassFinalizer : public AllStatic {
  public:
-  enum {
-    kGeneratingSnapshot = true,
-    kNotGeneratingSnapshot = false
-  };
-
-  // Add 'interface' to 'interface_list' if it is not already in the list and
-  // return true. Also return true if 'interface' is not added, because it is
-  // not unique, i.e. it is already in the list.
-  // Return false if 'interface' conflicts with an interface already in the list
-  // with the same class, but different type arguments.
-  // In the case of a conflict, set 'conflicting' to the existing interface.
-  static bool AddInterfaceIfUnique(const GrowableObjectArray& interface_list,
-                                   const AbstractType& interface,
-                                   AbstractType* conflicting);
-
   // Modes for type resolution and finalization. The ordering is relevant.
   enum FinalizationKind {
     kIgnore,                 // Parsed type is ignored and replaced by Dynamic.
@@ -77,20 +62,15 @@
   // 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 FinalizePendingClasses() {
-    return FinalizePendingClasses(kNotGeneratingSnapshot);
-  }
-  static bool FinalizePendingClassesForSnapshotCreation() {
-    return FinalizePendingClasses(kGeneratingSnapshot);
-  }
+  static bool FinalizePendingClasses();
 
-  // Verify that the pending classes have been properly prefinalized. This is
+
+  // Verify that the classes have been properly prefinalized. This is
   // needed during bootstrapping where the classes have been preloaded.
   static void VerifyBootstrapClasses();
 
  private:
-  static bool FinalizePendingClasses(bool generating_snapshot);
-  static void FinalizeClass(const Class& cls, bool generating_snapshot);
+  static void FinalizeClass(const Class& cls);
   static bool IsSuperCycleFree(const Class& cls);
   static bool IsAliasCycleFree(const Class& cls,
                                GrowableArray<intptr_t>* visited);
@@ -113,7 +93,6 @@
                                           const Function& function);
   static void ResolveAndFinalizeMemberTypes(const Class& cls);
   static void PrintClassInformation(const Class& cls);
-  static void VerifyClassImplements(const Class& cls);
   static void CollectInterfaces(const Class& cls,
                                 const GrowableObjectArray& interfaces);
   static void ReportError(const Error& error);