remove HEAP from tests

test/cctest/cctest.h

 // Copyright 2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 60 matching lines @@
 #undef DEFINE_EXTENSION_ID
 
 typedef v8::internal::EnumSet<CcTestExtensionIds> CcTestExtensionFlags;
 #define DEFINE_EXTENSION_FLAG(Name, Ident)                               \
   static const CcTestExtensionFlags Name(1 << Name##_ID);
   static const CcTestExtensionFlags NO_EXTENSIONS(0);
   static const CcTestExtensionFlags ALL_EXTENSIONS((1 << kMaxExtensions) - 1);
   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:
   typedef void (TestFunction)();
   CcTest(TestFunction* callback, const char* file, const char* name,
          const char* dependency, bool enabled, bool initialize);
   void Run();
   static CcTest* last() { return last_; }
   CcTest* prev() { return prev_; }
   const char* file() { return file_; }
   const char* name() { return name_; }
   const char* dependency() { return dependency_; }
   bool enabled() { return enabled_; }
   static v8::Isolate* default_isolate() { return isolate(); }
 
   static v8::Handle<v8::Context> env() {
     return v8::Local<v8::Context>::New(isolate(), context_);
   }
 
   static v8::Isolate* isolate() {
     return default_isolate_;
   }
 
   static i::Isolate* i_isolate() {
     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);
 
  private:
   friend int main(int argc, char** argv);
   TestFunction* callback_;
   const char* file_;
   const char* name_;
   const char* dependency_;
   bool enabled_;
@@ skipping 190 matching lines @@
 static inline void SimulateFullSpace(v8::internal::PagedSpace* space) {
   int old_linear_size = static_cast<int>(space->limit() - space->top());
   space->Free(space->top(), old_linear_size);
   space->SetTop(space->limit(), space->limit());
   space->ResetFreeList();
   space->ClearStats();
 }
 
 
 #endif  // ifndef CCTEST_H_