Move MemoryAllocator and CodeRange into Heap

src/heap/heap.h

Index: src/heap/heap.h
diff --git a/src/heap/heap.h b/src/heap/heap.h
index f6b49a33a7451583952fdcf0d503b4383cd5aed8..00d3331f368f8b7e6253993e194f38ee8e57aa30 100644
--- a/src/heap/heap.h
+++ b/src/heap/heap.h
@@ -928,6 +928,8 @@ class Heap {
 
   GCTracer* tracer() { return tracer_; }
 
+  MemoryAllocator* memory_allocator() { return memory_allocator_; }
+
   EmbedderHeapTracer* embedder_heap_tracer() { return embedder_heap_tracer_; }
 
   PromotionQueue* promotion_queue() { return &promotion_queue_; }
@@ -2150,6 +2152,8 @@ class Heap {
 
   MarkCompactCollector* mark_compact_collector_;
 
+  MemoryAllocator* memory_allocator_;
+
   StoreBuffer store_buffer_;
 
   IncrementalMarking* incremental_marking_;
@@ -2253,6 +2257,7 @@ class Heap {
   friend class Page;
   friend class Scavenger;
   friend class StoreBuffer;
+  friend class TestMemoryAllocatorScope;
 
   // The allocator interface.
   friend class Factory;