Move MemoryAllocator and CodeRange into Heap

src/heap/spaces.h

Index: src/heap/spaces.h
diff --git a/src/heap/spaces.h b/src/heap/spaces.h
index d76d253b7052233d4e0232c51d34fdd9670e15e5..2b0fac61969f9d995c219a757b3c53e5db986a66 100644
--- a/src/heap/spaces.h
+++ b/src/heap/spaces.h
@@ -1257,7 +1257,8 @@ class MemoryAllocator {
 
   // Initializes its internal bookkeeping structures.
   // Max capacity of the total space and executable memory limit.
-  bool SetUp(intptr_t max_capacity, intptr_t capacity_executable);
+  bool SetUp(intptr_t max_capacity, intptr_t capacity_executable,
+             intptr_t code_range_size);
 
   void TearDown();
 
@@ -1383,6 +1384,8 @@ class MemoryAllocator {
                                               Address start, size_t commit_size,
                                               size_t reserved_size);
 
+  CodeRange* code_range() { return code_range_; }
+
  private:
   // See AllocatePage for public interface. Note that currently we only support
   // pools for NOT_EXECUTABLE pages of size MemoryChunk::kPageSize.
@@ -1394,6 +1397,8 @@ class MemoryAllocator {
 
   Isolate* isolate_;
 
+  CodeRange* code_range_;
+
   // Maximum space size in bytes.
   intptr_t capacity_;
   // Maximum subset of capacity_ that can be executable
@@ -1447,6 +1452,8 @@ class MemoryAllocator {
 
   List<MemoryChunk*> chunk_pool_;
 
+  friend class TestCodeRangeScope;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(MemoryAllocator);
 };