Revert of Oilpan: Rename heap classes

Source/platform/heap/ThreadState.h

Index: Source/platform/heap/ThreadState.h
diff --git a/Source/platform/heap/ThreadState.h b/Source/platform/heap/ThreadState.h
index 929f058fa874faa162507e3db299cae0422abf1b..2d527207732ff80c2e2629f7b5b27581032ef8d2 100644
--- a/Source/platform/heap/ThreadState.h
+++ b/Source/platform/heap/ThreadState.h
@@ -51,7 +51,7 @@
 
 namespace blink {
 
-class BasePage;
+class BaseHeapPage;
 class CallbackStack;
 struct GCInfo;
 class HeapObjectHeader;
@@ -60,7 +60,7 @@
 class PersistentNode;
 class SafePointBarrier;
 class SafePointAwareMutexLocker;
-class BaseHeap;
+class ThreadHeap;
 class ThreadState;
 class Visitor;
 
@@ -179,13 +179,13 @@
 
 #define TypedHeapEnumName(Type) Type##Heap,
 
-enum HeapIndices {
-    NormalPageHeapIndex = 0,
-    VectorHeapIndex,
-    InlineVectorHeapIndex,
-    HashTableHeapIndex,
+enum TypedHeaps {
+    GeneralHeap = 0,
+    VectorBackingHeap,
+    InlineVectorBackingHeap,
+    HashTableBackingHeap,
     FOR_EACH_TYPED_HEAP(TypedHeapEnumName)
-    LargeObjectHeapIndex,
+    LargeObjectHeap,
     // Values used for iteration of heap segments.
     NumberOfHeaps,
 };
@@ -481,14 +481,14 @@
     // The heap is split into multiple heap parts based on object
     // types. To get the index for a given type, use
     // HeapIndexTrait<Type>::index.
-    BaseHeap* heap(int heapIndex) const { return m_heaps[heapIndex]; }
+    ThreadHeap* heap(int heapIndex) const { return m_heaps[heapIndex]; }
 
 #if ENABLE(ASSERT) || ENABLE(GC_PROFILING)
     // Infrastructure to determine if an address is within one of the
     // address ranges for the Blink heap. If the address is in the Blink
     // heap the containing heap page is returned.
-    BasePage* findPageFromAddress(Address);
-    BasePage* findPageFromAddress(void* pointer) { return findPageFromAddress(reinterpret_cast<Address>(pointer)); }
+    BaseHeapPage* findPageFromAddress(Address);
+    BaseHeapPage* findPageFromAddress(void* pointer) { return findPageFromAddress(reinterpret_cast<Address>(pointer)); }
 #endif
 
     // List of persistent roots allocated on the given thread.
@@ -666,7 +666,7 @@
     bool m_sweepForbidden;
     size_t m_noAllocationCount;
     size_t m_allocatedObjectSizeBeforeGC;
-    BaseHeap* m_heaps[NumberOfHeaps];
+    ThreadHeap* m_heaps[NumberOfHeaps];
 
     Vector<OwnPtr<CleanupTask>> m_cleanupTasks;
     bool m_isTerminating;