Revert "Distinguish beween final incremental mark-compact and full mark-compact event in IdleNotifi…

src/heap/heap.cc

Index: src/heap/heap.cc
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index 715e7ba300cca4d052c205c72acdd44ca0752e3a..97c7d6dac6434437fa50fa647294c34addbc379f 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -4374,12 +4374,12 @@ void Heap::IdleMarkCompact(const char* message) {
 
 void Heap::TryFinalizeIdleIncrementalMarking(
     size_t idle_time_in_ms, size_t size_of_objects,
-    size_t final_incremental_mark_compact_speed_in_bytes_per_ms) {
+    size_t mark_compact_speed_in_bytes_per_ms) {
   if (incremental_marking()->IsComplete() ||
       (mark_compact_collector()->IsMarkingDequeEmpty() &&
-       gc_idle_time_handler_.ShouldDoFinalIncrementalMarkCompact(
+       gc_idle_time_handler_.ShouldDoMarkCompact(
            idle_time_in_ms, size_of_objects,
-           final_incremental_mark_compact_speed_in_bytes_per_ms))) {
+           mark_compact_speed_in_bytes_per_ms))) {
     IdleMarkCompact("idle notification: finalize incremental");
   }
 }
@@ -4414,9 +4414,6 @@ bool Heap::IdleNotification(int idle_time_in_ms) {
       static_cast<size_t>(tracer()->MarkCompactSpeedInBytesPerMillisecond());
   heap_state.incremental_marking_speed_in_bytes_per_ms = static_cast<size_t>(
       tracer()->IncrementalMarkingSpeedInBytesPerMillisecond());
-  heap_state.final_incremental_mark_compact_speed_in_bytes_per_ms =
-      static_cast<size_t>(
-          tracer()->FinalIncrementalMarkCompactSpeedInBytesPerMillisecond());
   heap_state.scavenge_speed_in_bytes_per_ms =
       static_cast<size_t>(tracer()->ScavengeSpeedInBytesPerMillisecond());
   heap_state.used_new_space_size = new_space_.Size();
@@ -4447,7 +4444,7 @@ bool Heap::IdleNotification(int idle_time_in_ms) {
       if (remaining_idle_time_in_ms > 0) {
         TryFinalizeIdleIncrementalMarking(
             remaining_idle_time_in_ms, heap_state.size_of_objects,
-            heap_state.final_incremental_mark_compact_speed_in_bytes_per_ms);
+            heap_state.mark_compact_speed_in_bytes_per_ms);
       }
       break;
     }