Simplify reload error reporting

runtime/vm/isolate_reload.h

 // Copyright (c) 2016, 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.
 
 #ifndef VM_ISOLATE_RELOAD_H_
 #define VM_ISOLATE_RELOAD_H_
 
 #include "include/dart_tools_api.h"
 
 #include "vm/hash_map.h"
@@ skipping 179 matching lines @@
   void ReportOnJSON(JSONStream* stream);
 
   // Store morphing operation.
   void AddInstanceMorpher(InstanceMorpher* morpher);
 
   // Tells whether instance in the heap must be morphed.
   bool HasInstanceMorphers() const {
     return !instance_morphers_.is_empty();
   }
 
-  // NOTE: FinalizeLoading will be called *before* Reload() returns.
+  // NOTE: FinalizeLoading will be called *before* Reload() returns. This
+  // function will not be called if the embedder does not call
+  // Dart_FinalizeLoading.
   void FinalizeLoading();
-  void AbortReload(const Error& error);
+
+  // NOTE: FinalizeFailedLoad will be called *before* Reload returns. This
+  // function will not be called if the embedder calls Dart_FinalizeLoading.
+  void FinalizeFailedLoad(const Error& error);
+
+  // Called by both FinalizeLoading and FinalizeFailedLoad.
+  void CommonFinalizeTail();
 
   // Report back through the observatory channels.
   void ReportError(const Error& error);
   void ReportSuccess();
 
   void set_saved_root_library(const Library& value);
 
   void set_saved_libraries(const GrowableObjectArray& value);
 
   void VisitObjectPointers(ObjectPointerVisitor* visitor);
@@ skipping 122 matching lines @@
   friend class ObjectLocator;
   friend class MarkFunctionsForRecompilation;  // IsDirty.
   friend class ReasonForCancelling;
 
   static Dart_FileModifiedCallback file_modified_callback_;
 };
 
 }  // namespace dart
 
 #endif   // VM_ISOLATE_RELOAD_H_