command_buffer: Remove hash_tables.h, simplify atomicops.h

gpu/command_buffer/client/buffer_tracker.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GPU_COMMAND_BUFFER_CLIENT_BUFFER_TRACKER_H_
 #define GPU_COMMAND_BUFFER_CLIENT_BUFFER_TRACKER_H_
 
 #include <GLES2/gl2.h>
 
 #include <queue>
+#include "base/containers/hash_tables.h"
 #include "gles2_impl_export.h"
-#include "gpu/command_buffer/client/hash_tables.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 
 namespace gpu {
 
 class CommandBufferHelper;
 class MappedMemoryManager;
 
 namespace gles2 {
 
 // Tracks buffer objects for client side of command buffer.
@@ skipping 69 matching lines @@
 
   Buffer* CreateBuffer(GLuint id, GLsizeiptr size);
   Buffer* GetBuffer(GLuint id);
   void RemoveBuffer(GLuint id);
 
   // Frees the block of memory associated with buffer, pending the passage
   // of a token.
   void FreePendingToken(Buffer*, int32 token);
 
  private:
-  typedef gpu::hash_map<GLuint, Buffer*> BufferMap;
+  typedef base::hash_map<GLuint, Buffer*> BufferMap;
 
   MappedMemoryManager* mapped_memory_;
   BufferMap buffers_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferTracker);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_BUFFER_TRACKER_H_