| Index: src/arm/simulator-arm.h | 
| diff --git a/src/arm/simulator-arm.h b/src/arm/simulator-arm.h | 
| index b3c8eb41e515ba911183e452a3116f6e87094efd..71b8e4086245c1a3179b10ab1895925ea40adaf4 100644 | 
| --- a/src/arm/simulator-arm.h | 
| +++ b/src/arm/simulator-arm.h | 
| @@ -68,7 +68,7 @@ class SimulatorStack : public v8::internal::AllStatic { | 
|  | 
| #include "src/arm/constants-arm.h" | 
| #include "src/assembler.h" | 
| -#include "src/hashmap.h" | 
| +#include "src/base/hashmap.h" | 
|  | 
| namespace v8 { | 
| namespace internal { | 
| @@ -200,7 +200,7 @@ class Simulator { | 
| // Call on program start. | 
| static void Initialize(Isolate* isolate); | 
|  | 
| -  static void TearDown(HashMap* i_cache, Redirection* first); | 
| +  static void TearDown(base::HashMap* i_cache, Redirection* first); | 
|  | 
| // V8 generally calls into generated JS code with 5 parameters and into | 
| // generated RegExp code with 7 parameters. This is a convenience function, | 
| @@ -222,8 +222,7 @@ class Simulator { | 
| char* last_debugger_input() { return last_debugger_input_; } | 
|  | 
| // ICache checking. | 
| -  static void FlushICache(v8::internal::HashMap* i_cache, void* start, | 
| -                          size_t size); | 
| +  static void FlushICache(base::HashMap* i_cache, void* start, size_t size); | 
|  | 
| // Returns true if pc register contains one of the 'special_values' defined | 
| // below (bad_lr, end_sim_pc). | 
| @@ -342,10 +341,9 @@ class Simulator { | 
| void InstructionDecode(Instruction* instr); | 
|  | 
| // ICache. | 
| -  static void CheckICache(v8::internal::HashMap* i_cache, Instruction* instr); | 
| -  static void FlushOnePage(v8::internal::HashMap* i_cache, intptr_t start, | 
| -                           int size); | 
| -  static CachePage* GetCachePage(v8::internal::HashMap* i_cache, void* page); | 
| +  static void CheckICache(base::HashMap* i_cache, Instruction* instr); | 
| +  static void FlushOnePage(base::HashMap* i_cache, intptr_t start, int size); | 
| +  static CachePage* GetCachePage(base::HashMap* i_cache, void* page); | 
|  | 
| // Runtime call support. | 
| static void* RedirectExternalReference( | 
| @@ -405,7 +403,7 @@ class Simulator { | 
| char* last_debugger_input_; | 
|  | 
| // Icache simulation | 
| -  v8::internal::HashMap* i_cache_; | 
| +  base::HashMap* i_cache_; | 
|  | 
| // Registered breakpoints. | 
| Instruction* break_pc_; | 
|  |