Delete gpu/command_buffer/client/atomicops.h

gpu/command_buffer/client/share_group.cc

Index: gpu/command_buffer/client/share_group.cc
diff --git a/gpu/command_buffer/client/share_group.cc b/gpu/command_buffer/client/share_group.cc
index e61083d89ead15c96b2e51fb3396d13cfecb5f68..cb9f9bca5c6819e8769fdf11e738046eddafa364 100644
--- a/gpu/command_buffer/client/share_group.cc
+++ b/gpu/command_buffer/client/share_group.cc
@@ -5,7 +5,7 @@
 #include "gpu/command_buffer/client/share_group.h"
 
 #include "base/logging.h"
-#include "gpu/command_buffer/client/atomicops.h"
+#include "base/synchronization/lock.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/program_info_manager.h"
 #include "gpu/command_buffer/common/id_allocator.h"
@@ -157,7 +157,7 @@ class ThreadSafeIdHandlerWrapper : public IdHandlerInterface {
                        GLuint id_offset,
                        GLsizei n,
                        GLuint* ids) OVERRIDE {
-    AutoLock auto_lock(lock_);
+    base::AutoLock auto_lock(lock_);
     id_handler_->MakeIds(gl_impl, id_offset, n, ids);
   }
 
@@ -166,19 +166,19 @@ class ThreadSafeIdHandlerWrapper : public IdHandlerInterface {
                        GLsizei n,
                        const GLuint* ids,
                        DeleteFn delete_fn) OVERRIDE {
-    AutoLock auto_lock(lock_);
+    base::AutoLock auto_lock(lock_);
     return id_handler_->FreeIds(gl_impl, n, ids, delete_fn);
   }
 
   // Overridden from IdHandlerInterface.
   virtual bool MarkAsUsedForBind(GLuint id) OVERRIDE {
-    AutoLock auto_lock(lock_);
+    base::AutoLock auto_lock(lock_);
     return id_handler_->MarkAsUsedForBind(id);
   }
 
  private:
    scoped_ptr<IdHandlerInterface> id_handler_;
-   Lock lock_;
+   base::Lock lock_;
 };
 
 ShareGroup::ShareGroup(bool bind_generates_resource)