Move gpu hash_tables and atomicops stuff

gpu/command_buffer/client/query_tracker.cc

 // 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.
 
 #include "../client/query_tracker.h"
 
-#if !defined(__native_client__)
-  #include "base/atomicops.h"
-#endif
+#include "../client/atomicops.h"
 #include "../client/cmd_buffer_helper.h"
 #include "../client/mapped_memory.h"
 
 namespace gpu {
 namespace gles2 {
 
 QuerySyncManager::QuerySyncManager(MappedMemoryManager* manager)
     : mapped_memory_(manager) {
   GPU_DCHECK(manager);
 }
@@ skipping 32 matching lines @@
 void QuerySyncManager::Free(const QuerySyncManager::QueryInfo& info) {
   free_queries_.push(info);
 }
 
 bool QueryTracker::Query::CheckResultsAvailable(
     CommandBufferHelper* helper) {
   if (Pending()) {
     if (info_.sync->process_count == submit_count_) {
       // Need a MemoryBarrier here so that sync->result read after
       // sync->process_count.
-      #if defined(__native_client__)
-        __sync_synchronize();
-      #else
-        base::subtle::MemoryBarrier();
-      #endif
+      gpu::MemoryBarrier();
       result_ = info_.sync->result;
       state_ = kComplete;
     } else {
       if (!flushed_) {
         // TODO(gman): We could reduce the number of flushes by having a
         // flush count, recording that count at the time we insert the
         // EndQuery command and then only flushing here if we've have not
         // passed that count yet.
         flushed_ = true;
         helper->Flush();
@@ skipping 45 matching lines @@
     GPU_DCHECK(!query->Pending());
     query_sync_manager_.Free(query->info_);
     queries_.erase(it);
     delete query;
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu