command_buffer: Remove hash_tables.h, simplify atomicops.h

gpu/command_buffer/client/vertex_array_object_manager.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_VERTEX_ARRAY_OBJECT_MANAGER_H_
 #define GPU_COMMAND_BUFFER_CLIENT_VERTEX_ARRAY_OBJECT_MANAGER_H_
 
 #include <GLES2/gl2.h>
+#include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "gles2_impl_export.h"
-#include "gpu/command_buffer/client/hash_tables.h"
 #include "gpu/command_buffer/common/types.h"
 
 namespace gpu {
 namespace gles2 {
 
 class GLES2Implementation;
 class GLES2CmdHelper;
 class VertexArrayObject;
 
 // VertexArrayObjectManager manages vertex array objects on the client side
@@ skipping 64 matching lines @@
       GLenum type,
       GLboolean normalized,
       GLsizei stride,
       const void* ptr);
 
   void SetAttribDivisor(GLuint index, GLuint divisor);
 
   GLuint bound_element_array_buffer() const;
 
  private:
-  typedef gpu::hash_map<GLuint, VertexArrayObject*> VertexArrayObjectMap;
+  typedef base::hash_map<GLuint, VertexArrayObject*> VertexArrayObjectMap;
 
   bool IsDefaultVAOBound() const;
 
   GLsizei CollectData(const void* data,
                       GLsizei bytes_per_element,
                       GLsizei real_stride,
                       GLsizei num_elements);
 
   GLuint max_vertex_attribs_;
   GLuint array_buffer_id_;
   GLsizei array_buffer_size_;
   GLsizei array_buffer_offset_;
   GLuint element_array_buffer_id_;
   GLsizei element_array_buffer_size_;
   GLsizei collection_buffer_size_;
   scoped_ptr<int8[]> collection_buffer_;
 
   VertexArrayObject* default_vertex_array_object_;
   VertexArrayObject* bound_vertex_array_object_;
   VertexArrayObjectMap vertex_array_objects_;
 
   DISALLOW_COPY_AND_ASSIGN(VertexArrayObjectManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_VERTEX_ARRAY_OBJECT_MANAGER_H_