remove HEAP from tests

test/cctest/cctest.h

Index: test/cctest/cctest.h
diff --git a/test/cctest/cctest.h b/test/cctest/cctest.h
index 0fd0dcf69afe3d70d3722d8c8e569569eb9de670..3e0fb17821ed39ee6bbdf11317eb5746733d0309 100644
--- a/test/cctest/cctest.h
+++ b/test/cctest/cctest.h
@@ -78,9 +78,6 @@ typedef v8::internal::EnumSet<CcTestExtensionIds> CcTestExtensionFlags;
   EXTENSION_LIST(DEFINE_EXTENSION_FLAG)
 #undef DEFINE_EXTENSION_FLAG
 
-// Temporary macros for accessing current isolate and its subobjects.
-// They provide better readability, especially when used a lot in the code.
-#define HEAP (v8::internal::Isolate::Current()->heap())
 
 class CcTest {
  public:
@@ -108,6 +105,10 @@ class CcTest {
     return reinterpret_cast<i::Isolate*>(isolate());
   }
 
+  static i::Heap* heap() {
+    return i_isolate()->heap();
+  }
+
   // Helper function to initialize the VM.
   static void InitializeVM(CcTestExtensionFlags extensions = NO_EXTENSIONS);