| Index: src/mips/simulator-mips.cc | 
| diff --git a/src/mips/simulator-mips.cc b/src/mips/simulator-mips.cc | 
| index b0117e8544542676d0299b244affb47b0dd08603..92a940d6843e7a4d1d050433ec132f25baed8d80 100644 | 
| --- a/src/mips/simulator-mips.cc | 
| +++ b/src/mips/simulator-mips.cc | 
| @@ -865,7 +865,7 @@ void Simulator::set_last_debugger_input(char* input) { | 
| } | 
|  | 
|  | 
| -void Simulator::FlushICache(v8::internal::HashMap* i_cache, | 
| +void Simulator::FlushICache(base::HashMap* i_cache, | 
| void* start_addr, | 
| size_t size) { | 
| intptr_t start = reinterpret_cast<intptr_t>(start_addr); | 
| @@ -888,8 +888,8 @@ void Simulator::FlushICache(v8::internal::HashMap* i_cache, | 
| } | 
|  | 
|  | 
| -CachePage* Simulator::GetCachePage(v8::internal::HashMap* i_cache, void* page) { | 
| -  v8::internal::HashMap::Entry* entry = | 
| +CachePage* Simulator::GetCachePage(base::HashMap* i_cache, void* page) { | 
| +  base::HashMap::Entry* entry = | 
| i_cache->LookupOrInsert(page, ICacheHash(page)); | 
| if (entry->value == NULL) { | 
| CachePage* new_page = new CachePage(); | 
| @@ -900,7 +900,7 @@ CachePage* Simulator::GetCachePage(v8::internal::HashMap* i_cache, void* page) { | 
|  | 
|  | 
| // Flush from start up to and not including start + size. | 
| -void Simulator::FlushOnePage(v8::internal::HashMap* i_cache, | 
| +void Simulator::FlushOnePage(base::HashMap* i_cache, | 
| intptr_t start, | 
| int size) { | 
| DCHECK(size <= CachePage::kPageSize); | 
| @@ -915,7 +915,7 @@ void Simulator::FlushOnePage(v8::internal::HashMap* i_cache, | 
| } | 
|  | 
|  | 
| -void Simulator::CheckICache(v8::internal::HashMap* i_cache, | 
| +void Simulator::CheckICache(base::HashMap* i_cache, | 
| Instruction* instr) { | 
| intptr_t address = reinterpret_cast<intptr_t>(instr); | 
| void* page = reinterpret_cast<void*>(address & (~CachePage::kPageMask)); | 
| @@ -949,7 +949,7 @@ void Simulator::Initialize(Isolate* isolate) { | 
| Simulator::Simulator(Isolate* isolate) : isolate_(isolate) { | 
| i_cache_ = isolate_->simulator_i_cache(); | 
| if (i_cache_ == NULL) { | 
| -    i_cache_ = new v8::internal::HashMap(&ICacheMatch); | 
| +    i_cache_ = new base::HashMap(&ICacheMatch); | 
| isolate_->set_simulator_i_cache(i_cache_); | 
| } | 
| Initialize(isolate); | 
| @@ -1062,10 +1062,10 @@ class Redirection { | 
|  | 
|  | 
| // static | 
| -void Simulator::TearDown(HashMap* i_cache, Redirection* first) { | 
| +void Simulator::TearDown(base::HashMap* i_cache, Redirection* first) { | 
| Redirection::DeleteChain(first); | 
| if (i_cache != nullptr) { | 
| -    for (HashMap::Entry* entry = i_cache->Start(); entry != nullptr; | 
| +    for (base::HashMap::Entry* entry = i_cache->Start(); entry != nullptr; | 
| entry = i_cache->Next(entry)) { | 
| delete static_cast<CachePage*>(entry->value); | 
| } | 
|  |