| Index: test/cctest/test-global-handles.cc
 | 
| diff --git a/test/cctest/test-global-handles.cc b/test/cctest/test-global-handles.cc
 | 
| index e608645e9ce39a844951d22c8e54fdf446713c18..d0b80d1c8f51fc72270d64371d0c75f56dfe3d79 100644
 | 
| --- a/test/cctest/test-global-handles.cc
 | 
| +++ b/test/cctest/test-global-handles.cc
 | 
| @@ -87,18 +87,18 @@ class TestObjectVisitor : public ObjectVisitor {
 | 
|  TEST(IterateObjectGroupsOldApi) {
 | 
|    CcTest::InitializeVM();
 | 
|    GlobalHandles* global_handles = CcTest::i_isolate()->global_handles();
 | 
| -
 | 
| +  Heap* heap = CcTest::heap();
 | 
|    v8::HandleScope handle_scope(CcTest::isolate());
 | 
|  
 | 
|    Handle<Object> g1s1 =
 | 
| -      global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
 | 
| +      global_handles->Create(heap->AllocateFixedArray(1)->ToObjectChecked());
 | 
|    Handle<Object> g1s2 =
 | 
| -      global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
 | 
| +      global_handles->Create(heap->AllocateFixedArray(1)->ToObjectChecked());
 | 
|  
 | 
|    Handle<Object> g2s1 =
 | 
| -      global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
 | 
| +      global_handles->Create(heap->AllocateFixedArray(1)->ToObjectChecked());
 | 
|    Handle<Object> g2s2 =
 | 
| -      global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
 | 
| +      global_handles->Create(heap->AllocateFixedArray(1)->ToObjectChecked());
 | 
|  
 | 
|    TestRetainedObjectInfo info1;
 | 
|    TestRetainedObjectInfo info2;
 | 
| @@ -182,18 +182,19 @@ TEST(IterateObjectGroupsOldApi) {
 | 
|  TEST(IterateObjectGroups) {
 | 
|    CcTest::InitializeVM();
 | 
|    GlobalHandles* global_handles = CcTest::i_isolate()->global_handles();
 | 
| +  Heap* heap = CcTest::heap();
 | 
|  
 | 
|    v8::HandleScope handle_scope(CcTest::isolate());
 | 
|  
 | 
|    Handle<Object> g1s1 =
 | 
| -      global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
 | 
| +      global_handles->Create(heap->AllocateFixedArray(1)->ToObjectChecked());
 | 
|    Handle<Object> g1s2 =
 | 
| -      global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
 | 
| +      global_handles->Create(heap->AllocateFixedArray(1)->ToObjectChecked());
 | 
|  
 | 
|    Handle<Object> g2s1 =
 | 
| -      global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
 | 
| +      global_handles->Create(heap->AllocateFixedArray(1)->ToObjectChecked());
 | 
|    Handle<Object> g2s2 =
 | 
| -    global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
 | 
| +    global_handles->Create(heap->AllocateFixedArray(1)->ToObjectChecked());
 | 
|  
 | 
|    TestRetainedObjectInfo info1;
 | 
|    TestRetainedObjectInfo info2;
 | 
| @@ -276,23 +277,24 @@ TEST(IterateObjectGroups) {
 | 
|  TEST(ImplicitReferences) {
 | 
|    CcTest::InitializeVM();
 | 
|    GlobalHandles* global_handles = CcTest::i_isolate()->global_handles();
 | 
| +  Heap* heap = CcTest::heap();
 | 
|  
 | 
|    v8::HandleScope handle_scope(CcTest::isolate());
 | 
|  
 | 
|    Handle<Object> g1s1 =
 | 
| -      global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
 | 
| +      global_handles->Create(heap->AllocateFixedArray(1)->ToObjectChecked());
 | 
|    Handle<Object> g1c1 =
 | 
| -      global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
 | 
| +      global_handles->Create(heap->AllocateFixedArray(1)->ToObjectChecked());
 | 
|    Handle<Object> g1c2 =
 | 
| -      global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
 | 
| +      global_handles->Create(heap->AllocateFixedArray(1)->ToObjectChecked());
 | 
|  
 | 
|  
 | 
|    Handle<Object> g2s1 =
 | 
| -      global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
 | 
| +      global_handles->Create(heap->AllocateFixedArray(1)->ToObjectChecked());
 | 
|    Handle<Object> g2s2 =
 | 
| -    global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
 | 
| +    global_handles->Create(heap->AllocateFixedArray(1)->ToObjectChecked());
 | 
|    Handle<Object> g2c1 =
 | 
| -    global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
 | 
| +    global_handles->Create(heap->AllocateFixedArray(1)->ToObjectChecked());
 | 
|  
 | 
|    global_handles->SetObjectGroupId(g1s1.location(), UniqueId(1));
 | 
|    global_handles->SetObjectGroupId(g2s1.location(), UniqueId(2));
 | 
| 
 |