Revert of Oilpan: Rename heap classes

Source/platform/heap/ThreadState.cpp

Index: Source/platform/heap/ThreadState.cpp
diff --git a/Source/platform/heap/ThreadState.cpp b/Source/platform/heap/ThreadState.cpp
index 1b06990477473b3b8b60b9405cc4cc94229fd190..556e355b9e3d4a1d666b6535e878053ae04b3c07 100644
--- a/Source/platform/heap/ThreadState.cpp
+++ b/Source/platform/heap/ThreadState.cpp
@@ -305,9 +305,9 @@
         s_mainThreadUnderestimatedStackSize = StackFrameDepth::getUnderestimatedStackSize() - sizeof(void*);
     }
 
-    for (int heapIndex = 0; heapIndex < LargeObjectHeapIndex; heapIndex++)
-        m_heaps[heapIndex] = new NormalPageHeap(this, heapIndex);
-    m_heaps[LargeObjectHeapIndex] = new LargeObjectHeap(this, LargeObjectHeapIndex);
+    for (int heapIndex = 0; heapIndex < LargeObjectHeap; heapIndex++)
+        m_heaps[heapIndex] = new ThreadHeapForHeapPage(this, heapIndex);
+    m_heaps[LargeObjectHeap] = new ThreadHeapForLargeObject(this, LargeObjectHeap);
 
     m_weakCallbackStack = new CallbackStack();
 }
@@ -570,7 +570,7 @@
 #if ENABLE(GC_PROFILING)
 const GCInfo* ThreadState::findGCInfo(Address address)
 {
-    if (BasePage* page = findPageFromAddress(address))
+    if (BaseHeapPage* page = findPageFromAddress(address))
         return page->findGCInfo(address);
     return nullptr;
 }
@@ -1002,10 +1002,10 @@
 }
 
 #if ENABLE(ASSERT) || ENABLE(GC_PROFILING)
-BasePage* ThreadState::findPageFromAddress(Address address)
+BaseHeapPage* ThreadState::findPageFromAddress(Address address)
 {
     for (int i = 0; i < NumberOfHeaps; ++i) {
-        if (BasePage* page = m_heaps[i]->findPageFromAddress(address))
+        if (BaseHeapPage* page = m_heaps[i]->findPageFromAddress(address))
             return page;
     }
     return nullptr;