[heap] Remove Marking::MarkBlack and some minor cleanups.

test/unittests/heap/marking-unittest.cc

Index: test/unittests/heap/marking-unittest.cc
diff --git a/test/unittests/heap/marking-unittest.cc b/test/unittests/heap/marking-unittest.cc
index 074816bf1f6a20d024e0d05d9cd59d4f16c0e319..edb39c87fc08f11cf789e290a17b53e2b11247b4 100644
--- a/test/unittests/heap/marking-unittest.cc
+++ b/test/unittests/heap/marking-unittest.cc
@@ -11,25 +11,6 @@
 namespace v8 {
 namespace internal {
 
-TEST(Marking, MarkWhiteBlackWhite) {
-  Bitmap* bitmap = reinterpret_cast<Bitmap*>(
-      calloc(Bitmap::kSize / kPointerSize, kPointerSize));
-  const int kLocationsSize = 3;
-  int position[kLocationsSize] = {
-      Bitmap::kBitsPerCell - 2, Bitmap::kBitsPerCell - 1, Bitmap::kBitsPerCell};
-  for (int i = 0; i < kLocationsSize; i++) {
-    MarkBit mark_bit = bitmap->MarkBitFromIndex(position[i]);
-    CHECK(Marking::IsWhite(mark_bit));
-    CHECK(!Marking::IsImpossible(mark_bit));
-    Marking::MarkBlack(mark_bit);
-    CHECK(Marking::IsBlack(mark_bit));
-    CHECK(!Marking::IsImpossible(mark_bit));
-    Marking::MarkWhite(mark_bit);
-    CHECK(Marking::IsWhite(mark_bit));
-    CHECK(!Marking::IsImpossible(mark_bit));
-  }
-  free(bitmap);
-}
 
 TEST(Marking, TransitionWhiteBlackWhite) {
   Bitmap* bitmap = reinterpret_cast<Bitmap*>(
@@ -65,7 +46,7 @@ TEST(Marking, TransitionAnyToGrey) {
     CHECK(Marking::IsGrey(mark_bit));
     CHECK(Marking::IsBlackOrGrey(mark_bit));
     CHECK(!Marking::IsImpossible(mark_bit));
-    Marking::MarkBlack(mark_bit);
+    Marking::GreyToBlack(mark_bit);
     CHECK(Marking::IsBlack(mark_bit));
     CHECK(Marking::IsBlackOrGrey(mark_bit));
     CHECK(!Marking::IsImpossible(mark_bit));
@@ -73,7 +54,7 @@ TEST(Marking, TransitionAnyToGrey) {
     CHECK(Marking::IsGrey(mark_bit));
     CHECK(Marking::IsBlackOrGrey(mark_bit));
     CHECK(!Marking::IsImpossible(mark_bit));
-    Marking::MarkWhite(mark_bit);
+    Marking::GreyToWhite(mark_bit);
     CHECK(Marking::IsWhite(mark_bit));
     CHECK(!Marking::IsImpossible(mark_bit));
   }
@@ -103,7 +84,7 @@ TEST(Marking, TransitionWhiteGreyBlackGrey) {
     CHECK(Marking::IsGrey(mark_bit));
     CHECK(Marking::IsBlackOrGrey(mark_bit));
     CHECK(!Marking::IsImpossible(mark_bit));
-    Marking::MarkWhite(mark_bit);
+    Marking::GreyToWhite(mark_bit);
     CHECK(Marking::IsWhite(mark_bit));
     CHECK(!Marking::IsImpossible(mark_bit));
   }