Move gpu hash_tables and atomicops stuff

gpu/command_buffer/client/query_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_QUERY_TRACKER_H_
 #define GPU_COMMAND_BUFFER_CLIENT_QUERY_TRACKER_H_
 
 #include <GLES2/gl2.h>
 
 #include <queue>
 #include "../../gpu_export.h"
-#if defined(__native_client__)
-  #include <tr1/unordered_map>
-#else
-  #include "base/hash_tables.h"
-#endif
+#include "../client/hash_tables.h"
 #include "../common/gles2_cmd_format.h"
 
 namespace gpu {
 
 class CommandBufferHelper;
 class MappedMemoryManager;
 
 namespace gles2 {
 
 // Manages buckets of QuerySync instances in mapped memory.
@@ skipping 118 matching lines @@
   };
 
   QueryTracker(MappedMemoryManager* manager);
   ~QueryTracker();
 
   Query* CreateQuery(GLuint id, GLenum target);
   Query* GetQuery(GLuint id);
   void RemoveQuery(GLuint id);
 
  private:
-  #if defined(__native_client__)
-    typedef std::tr1::unordered_map<GLuint, Query*> QueryMap;
-  #else
-    typedef base::hash_map<GLuint, Query*> QueryMap;
-  #endif
+  typedef gpu::hash_map<GLuint, Query*> QueryMap;
 
   QueryMap queries_;
   QuerySyncManager query_sync_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(QueryTracker);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_QUERY_TRACKER_H_