command_buffer: Remove hash_tables.h, simplify atomicops.h

gpu/command_buffer/client/gpu_memory_buffer_tracker.h

Index: gpu/command_buffer/client/gpu_memory_buffer_tracker.h
diff --git a/gpu/command_buffer/client/gpu_memory_buffer_tracker.h b/gpu/command_buffer/client/gpu_memory_buffer_tracker.h
index 0b07dd0a14817068405751f569cfd3d964165d01..84158818a3760cc8f29d8d07d094f40595f7e3a6 100644
--- a/gpu/command_buffer/client/gpu_memory_buffer_tracker.h
+++ b/gpu/command_buffer/client/gpu_memory_buffer_tracker.h
@@ -6,8 +6,8 @@
 #define GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_TRACKER_H_
 
 #include "base/basictypes.h"
+#include "base/containers/hash_tables.h"
 #include "gles2_impl_export.h"
-#include "gpu/command_buffer/client/hash_tables.h"
 
 namespace gfx {
 class GpuMemoryBuffer;
@@ -29,7 +29,7 @@ class GLES2_IMPL_EXPORT GpuMemoryBufferTracker {
   void RemoveBuffer(int32 image_id);
 
  private:
-  typedef gpu::hash_map<int32, gfx::GpuMemoryBuffer*> BufferMap;
+  typedef base::hash_map<int32, gfx::GpuMemoryBuffer*> BufferMap;
   BufferMap buffers_;
   GpuControl* gpu_control_;