[heap] Untangle Marking and friends from heap dependencies.

src/heap/heap-inl.h

Index: src/heap/heap-inl.h
diff --git a/src/heap/heap-inl.h b/src/heap/heap-inl.h
index a58a2b74b57ef28158422a7a8cf0b1bbe87bb670..25400dd261c704b02a7decb25f8a56990fdb1592 100644
--- a/src/heap/heap-inl.h
+++ b/src/heap/heap-inl.h
@@ -254,7 +254,7 @@ AllocationResult Heap::AllocateRaw(int size_in_bytes, AllocationSpace space,
 
   if (!old_gen_exhausted_ && incremental_marking()->black_allocation() &&
       space != OLD_SPACE) {
-    Marking::MarkBlack(Marking::MarkBitFrom(object));
+    Marking::MarkBlack(ObjectMarking::MarkBitFrom(object));
     MemoryChunk::IncrementLiveBytesFromGC(object, size_in_bytes);
   }
   return allocation;
@@ -399,7 +399,7 @@ bool Heap::ShouldBePromoted(Address old_address, int object_size) {
   Address age_mark = new_space_.age_mark();
 
   if (promotion_mode == PROMOTE_MARKED) {
-    MarkBit mark_bit = Marking::MarkBitFrom(old_address);
+    MarkBit mark_bit = ObjectMarking::MarkBitFrom(old_address);
     if (!Marking::IsWhite(mark_bit)) {
       return true;
     }