Revert of [heap] More flag cleanup.

src/api.cc

Index: src/api.cc
diff --git a/src/api.cc b/src/api.cc
index 2c8c93722060a61a7fa061afd73fedf29d09c804..42a887582723524f4773847d51cdb2da5f58827a 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -6880,7 +6880,7 @@
           kGCCallbackFlagSynchronousPhantomCallbackProcessing, gc_reason);
     } else {
       heap->CollectAllGarbage(
-          gc_reason, i::Heap::kNoGCFlags,
+          i::Heap::kNoGCFlags, gc_reason,
           kGCCallbackFlagSynchronousPhantomCallbackProcessing);
     }
   } else {
@@ -7071,13 +7071,13 @@
   CHECK(i::FLAG_expose_gc);
   if (type == kMinorGarbageCollection) {
     reinterpret_cast<i::Isolate*>(this)->heap()->CollectGarbage(
-        i::NEW_SPACE, "Isolate::RequestGarbageCollection", i::Heap::kNoGCFlags,
+        i::NEW_SPACE, "Isolate::RequestGarbageCollection",
         kGCCallbackFlagForced);
   } else {
     DCHECK_EQ(kFullGarbageCollection, type);
     reinterpret_cast<i::Isolate*>(this)->heap()->CollectAllGarbage(
-        "Isolate::RequestGarbageCollection",
-        i::Heap::kAbortIncrementalMarkingMask, kGCCallbackFlagForced);
+        i::Heap::kAbortIncrementalMarkingMask,
+        "Isolate::RequestGarbageCollection", kGCCallbackFlagForced);
   }
 }