Delete gpu/command_buffer/client/atomicops.h

gpu/command_buffer/client/share_group.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 "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"
 
 namespace gpu {
 namespace gles2 {
 
 COMPILE_ASSERT(gpu::kInvalidResource == 0,
                INVALID_RESOURCE_NOT_0_AS_GL_EXPECTS);
 
@@ skipping 131 matching lines @@
   ThreadSafeIdHandlerWrapper(IdHandlerInterface* id_handler)
       : id_handler_(id_handler) {
   }
   virtual ~ThreadSafeIdHandlerWrapper() { }
 
   // Overridden from IdHandlerInterface.
   virtual void MakeIds(GLES2Implementation* gl_impl,
                        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);
   }
 
   // Overridden from IdHandlerInterface.
   virtual bool FreeIds(GLES2Implementation* gl_impl,
                        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)
     : bind_generates_resource_(bind_generates_resource) {
   if (bind_generates_resource) {
     for (int i = 0; i < id_namespaces::kNumIdNamespaces; ++i) {
       if (i == id_namespaces::kProgramsAndShaders) {
         id_handlers_[i].reset(new ThreadSafeIdHandlerWrapper(
             new NonReusedIdHandler()));
       } else {
@@ skipping 16 matching lines @@
 }
 
 void ShareGroup::set_program_info_manager(ProgramInfoManager* manager) {
   program_info_manager_.reset(manager);
 }
 
 ShareGroup::~ShareGroup() {}
 
 }  // namespace gles2
 }  // namespace gpu