| Index: test/cctest/test-spaces.cc
 | 
| ===================================================================
 | 
| --- test/cctest/test-spaces.cc	(revision 10404)
 | 
| +++ test/cctest/test-spaces.cc	(working copy)
 | 
| @@ -125,14 +125,14 @@
 | 
|  
 | 
|  
 | 
|  TEST(MemoryAllocator) {
 | 
| -  OS::Setup();
 | 
| +  OS::SetUp();
 | 
|    Isolate* isolate = Isolate::Current();
 | 
|    isolate->InitializeLoggingAndCounters();
 | 
|    Heap* heap = isolate->heap();
 | 
|    CHECK(isolate->heap()->ConfigureHeapDefault());
 | 
|  
 | 
|    MemoryAllocator* memory_allocator = new MemoryAllocator(isolate);
 | 
| -  CHECK(memory_allocator->Setup(heap->MaxReserved(),
 | 
| +  CHECK(memory_allocator->SetUp(heap->MaxReserved(),
 | 
|                                  heap->MaxExecutableSize()));
 | 
|  
 | 
|    int total_pages = 0;
 | 
| @@ -175,21 +175,21 @@
 | 
|  
 | 
|  
 | 
|  TEST(NewSpace) {
 | 
| -  OS::Setup();
 | 
| +  OS::SetUp();
 | 
|    Isolate* isolate = Isolate::Current();
 | 
|    isolate->InitializeLoggingAndCounters();
 | 
|    Heap* heap = isolate->heap();
 | 
|    CHECK(heap->ConfigureHeapDefault());
 | 
|    MemoryAllocator* memory_allocator = new MemoryAllocator(isolate);
 | 
| -  CHECK(memory_allocator->Setup(heap->MaxReserved(),
 | 
| +  CHECK(memory_allocator->SetUp(heap->MaxReserved(),
 | 
|                                  heap->MaxExecutableSize()));
 | 
|    TestMemoryAllocatorScope test_scope(isolate, memory_allocator);
 | 
|  
 | 
|    NewSpace new_space(heap);
 | 
|  
 | 
| -  CHECK(new_space.Setup(HEAP->ReservedSemiSpaceSize(),
 | 
| +  CHECK(new_space.SetUp(HEAP->ReservedSemiSpaceSize(),
 | 
|                          HEAP->ReservedSemiSpaceSize()));
 | 
| -  CHECK(new_space.HasBeenSetup());
 | 
| +  CHECK(new_space.HasBeenSetUp());
 | 
|  
 | 
|    while (new_space.Available() >= Page::kMaxHeapObjectSize) {
 | 
|      Object* obj =
 | 
| @@ -204,13 +204,13 @@
 | 
|  
 | 
|  
 | 
|  TEST(OldSpace) {
 | 
| -  OS::Setup();
 | 
| +  OS::SetUp();
 | 
|    Isolate* isolate = Isolate::Current();
 | 
|    isolate->InitializeLoggingAndCounters();
 | 
|    Heap* heap = isolate->heap();
 | 
|    CHECK(heap->ConfigureHeapDefault());
 | 
|    MemoryAllocator* memory_allocator = new MemoryAllocator(isolate);
 | 
| -  CHECK(memory_allocator->Setup(heap->MaxReserved(),
 | 
| +  CHECK(memory_allocator->SetUp(heap->MaxReserved(),
 | 
|                                  heap->MaxExecutableSize()));
 | 
|    TestMemoryAllocatorScope test_scope(isolate, memory_allocator);
 | 
|  
 | 
| @@ -220,7 +220,7 @@
 | 
|                               NOT_EXECUTABLE);
 | 
|    CHECK(s != NULL);
 | 
|  
 | 
| -  CHECK(s->Setup());
 | 
| +  CHECK(s->SetUp());
 | 
|  
 | 
|    while (s->Available() > 0) {
 | 
|      s->AllocateRaw(Page::kMaxHeapObjectSize)->ToObjectUnchecked();
 | 
| 
 |