Move hashmap into base/.

src/libsampler/v8-sampler.cc

Index: src/libsampler/v8-sampler.cc
diff --git a/src/libsampler/v8-sampler.cc b/src/libsampler/v8-sampler.cc
index f4bf7b1a48a6475dddc1ba0d964d202ed565ba3a..f39f95b17a04888c5791334311d506baaf3024d9 100644
--- a/src/libsampler/v8-sampler.cc
+++ b/src/libsampler/v8-sampler.cc
@@ -47,9 +47,8 @@
 #include <map>
 
 #include "src/base/atomic-utils.h"
+#include "src/base/hashmap.h"
 #include "src/base/platform/platform.h"
-#include "src/libsampler/hashmap.h"
-
 
 #if V8_OS_ANDROID && !defined(__BIONIC_HAVE_UCONTEXT_T)
 
@@ -229,9 +228,8 @@ class SamplerManager {
     DCHECK(sampler->IsActive() || !sampler->IsRegistered());
     // Add sampler into map if needed.
     pthread_t thread_id = sampler->platform_data()->vm_tid();
-    HashMap::Entry* entry =
-        sampler_map_.Pointer()->LookupOrInsert(ThreadKey(thread_id),
-                                               ThreadHash(thread_id));
+    base::HashMap::Entry* entry = sampler_map_.Pointer()->LookupOrInsert(
+        ThreadKey(thread_id), ThreadHash(thread_id));
     DCHECK(entry != NULL);
     if (entry->value == NULL) {
       SamplerList* samplers = new SamplerList();
@@ -260,7 +258,8 @@ class SamplerManager {
     pthread_t thread_id = sampler->platform_data()->vm_tid();
     void* thread_key = ThreadKey(thread_id);
     uint32_t thread_hash = ThreadHash(thread_id);
-    HashMap::Entry* entry = sampler_map_.Get().Lookup(thread_key, thread_hash);
+    base::HashMap::Entry* entry =
+        sampler_map_.Get().Lookup(thread_key, thread_hash);
     DCHECK(entry != NULL);
     SamplerList* samplers = reinterpret_cast<SamplerList*>(entry->value);
     for (SamplerListIterator iter = samplers->begin(); iter != samplers->end();
@@ -278,17 +277,17 @@ class SamplerManager {
 
  private:
   struct HashMapCreateTrait {
-    static void Construct(HashMap* allocated_ptr) {
-      new (allocated_ptr) HashMap(HashMap::PointersMatch);
+    static void Construct(base::HashMap* allocated_ptr) {
+      new (allocated_ptr) base::HashMap(base::HashMap::PointersMatch);
     }
   };
   friend class SignalHandler;
-  static base::LazyInstance<HashMap, HashMapCreateTrait>::type
+  static base::LazyInstance<base::HashMap, HashMapCreateTrait>::type
       sampler_map_;
   static base::AtomicValue<int> samplers_access_counter_;
 };
 
-base::LazyInstance<HashMap, SamplerManager::HashMapCreateTrait>::type
+base::LazyInstance<base::HashMap, SamplerManager::HashMapCreateTrait>::type
     SamplerManager::sampler_map_ = LAZY_INSTANCE_INITIALIZER;
 base::AtomicValue<int> SamplerManager::samplers_access_counter_(0);
 
@@ -401,9 +400,8 @@ void SignalHandler::HandleProfilerSignal(int signal, siginfo_t* info,
   AtomicGuard atomic_guard(&SamplerManager::samplers_access_counter_, false);
   if (!atomic_guard.is_success()) return;
   pthread_t thread_id = pthread_self();
-  HashMap::Entry* entry =
-      SamplerManager::sampler_map_.Pointer()->Lookup(ThreadKey(thread_id),
-                                                     ThreadHash(thread_id));
+  base::HashMap::Entry* entry = SamplerManager::sampler_map_.Pointer()->Lookup(
+      ThreadKey(thread_id), ThreadHash(thread_id));
   if (entry == NULL) return;
   SamplerList* samplers = reinterpret_cast<SamplerList*>(entry->value);