Revert of [heap] More flag cleanup.

test/cctest/test-mementos.cc

Index: test/cctest/test-mementos.cc
diff --git a/test/cctest/test-mementos.cc b/test/cctest/test-mementos.cc
index 518c93b6210c8f9d3040e9e8f659b16359aed873..a97666384bf245d3f7c1b840d93ddc9673cbb0f4 100644
--- a/test/cctest/test-mementos.cc
+++ b/test/cctest/test-mementos.cc
@@ -63,7 +63,7 @@
   // Call GC to see if we can handle a poisonous memento right after the
   // current new space top pointer.
   CcTest::i_isolate()->heap()->CollectAllGarbage(
-      "Regress340063", Heap::kAbortIncrementalMarkingMask);
+      Heap::kAbortIncrementalMarkingMask);
 }
 
 
@@ -81,7 +81,7 @@
   // Call GC to see if we can handle a poisonous memento right after the
   // current new space top pointer.
   CcTest::i_isolate()->heap()->CollectAllGarbage(
-      "Regress470390", Heap::kAbortIncrementalMarkingMask);
+      Heap::kAbortIncrementalMarkingMask);
 }
 
 
@@ -93,7 +93,7 @@
   SetUpNewSpaceWithPoisonedMementoAtTop();
 
   // Force GC to test the poisoned memento handling
-  CcTest::i_isolate()->heap()->CollectGarbageNewSpace();
+  CcTest::i_isolate()->heap()->CollectGarbage(i::NEW_SPACE);
 }