Revert of [heap] More flag cleanup.

src/heap-snapshot-generator.cc

Index: src/heap-snapshot-generator.cc
diff --git a/src/heap-snapshot-generator.cc b/src/heap-snapshot-generator.cc
index 05581b28209bb1d8a7119cee11da6aa7b04c2bf3..3fda04fa5bbc2af679c82fa6df0ca77bdd10ac47 100644
--- a/src/heap-snapshot-generator.cc
+++ b/src/heap-snapshot-generator.cc
@@ -478,8 +478,8 @@
     PrintF("Begin HeapObjectsMap::UpdateHeapObjectsMap. map has %d entries.\n",
            entries_map_.occupancy());
   }
-  heap_->CollectAllGarbage("HeapObjectsMap::UpdateHeapObjectsMap",
-                           Heap::kMakeHeapIterableMask);
+  heap_->CollectAllGarbage(Heap::kMakeHeapIterableMask,
+                          "HeapObjectsMap::UpdateHeapObjectsMap");
   HeapIterator iterator(heap_);
   for (HeapObject* obj = iterator.next();
        obj != NULL;
@@ -2554,10 +2554,12 @@
   // full GC is reachable from the root when computing dominators.
   // This is not true for weakly reachable objects.
   // As a temporary solution we call GC twice.
-  heap_->CollectAllGarbage("HeapSnapshotGenerator::GenerateSnapshot",
-                           Heap::kMakeHeapIterableMask);
-  heap_->CollectAllGarbage("HeapSnapshotGenerator::GenerateSnapshot",
-                           Heap::kMakeHeapIterableMask);
+  heap_->CollectAllGarbage(
+      Heap::kMakeHeapIterableMask,
+      "HeapSnapshotGenerator::GenerateSnapshot");
+  heap_->CollectAllGarbage(
+      Heap::kMakeHeapIterableMask,
+      "HeapSnapshotGenerator::GenerateSnapshot");
 
 #ifdef VERIFY_HEAP
   Heap* debug_heap = heap_;