command_buffer: Remove hash_tables.h, simplify atomicops.h

gpu/command_buffer/client/query_tracker.h

Index: gpu/command_buffer/client/query_tracker.h
diff --git a/gpu/command_buffer/client/query_tracker.h b/gpu/command_buffer/client/query_tracker.h
index 81861c997a9bf3efdf7f70e5f76189679dcd5145..9e7f501768b74a5bbfa4dccfb2bee6e153622dfa 100644
--- a/gpu/command_buffer/client/query_tracker.h
+++ b/gpu/command_buffer/client/query_tracker.h
@@ -10,8 +10,8 @@
 #include <deque>
 #include <list>
 
+#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 {
@@ -161,7 +161,7 @@ class GLES2_IMPL_EXPORT QueryTracker {
   void FreeCompletedQueries();
 
  private:
-  typedef gpu::hash_map<GLuint, Query*> QueryMap;
+  typedef base::hash_map<GLuint, Query*> QueryMap;
   typedef std::list<Query*> QueryList;
 
   QueryMap queries_;