[heap] Harden heap-related cctests

test/cctest/test-slots-buffer.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/heap/slots-buffer.h"
 #include "test/cctest/cctest.h"
-#include "test/cctest/heap/utils-inl.h"
+#include "test/cctest/heap/heap-utils.h"
 
 namespace v8 {
 namespace internal {
 
 TEST(SlotsBufferObjectSlotsRemoval) {
   CcTest::InitializeVM();
   v8::HandleScope scope(CcTest::isolate());
   Isolate* isolate = CcTest::i_isolate();
   Heap* heap = isolate->heap();
   Factory* factory = isolate->factory();
@@ skipping 76 matching lines @@
       factory->NewFixedArray(23, TENURED);
   mark_bit = Marking::MarkBitFrom(*old_space_object_non_evacuation);
   Marking::MarkBlack(mark_bit);
   Object** field_old_space_object_non_evacuation =
       fake_object->RawFieldOfElementAt(2);
   *field_old_space_object_non_evacuation = *old_space_object_non_evacuation;
   buffer->Add(field_old_space_object_non_evacuation);
 
   // Write an old space reference into field 4 which points to an object on an
   // evacuation candidate.
-  SimulateFullSpace(heap->old_space());
+  heap::SimulateFullSpace(heap->old_space());
   Handle<FixedArray> valid_object =
       isolate->factory()->NewFixedArray(23, TENURED);
   Page* page = Page::FromAddress(valid_object->address());
   page->SetFlag(MemoryChunk::EVACUATION_CANDIDATE);
   Object** valid_field = fake_object->RawFieldOfElementAt(3);
   *valid_field = *valid_object;
   buffer->Add(valid_field);
 
   SlotsBuffer::RemoveInvalidSlots(heap, buffer);
   Object** kRemovedEntry = HeapObject::RawField(heap->empty_fixed_array(),
                                                 FixedArrayBase::kLengthOffset);
   CHECK_EQ(buffer->Get(0), kRemovedEntry);
   CHECK_EQ(buffer->Get(1), kRemovedEntry);
   CHECK_EQ(buffer->Get(2), kRemovedEntry);
   CHECK_EQ(buffer->Get(3), valid_field);
 
   // Clean-up to make verify heap happy.
   mark_bit = Marking::MarkBitFrom(*fake_object);
   Marking::MarkWhite(mark_bit);
   mark_bit = Marking::MarkBitFrom(*new_space_object);
   Marking::MarkWhite(mark_bit);
   mark_bit = Marking::MarkBitFrom(*old_space_object_non_evacuation);
   Marking::MarkWhite(mark_bit);
 
   delete buffer;
 }
 
 }  // namespace internal
 }  // namespace v8