cc: Lock access to |buffers_| in TestGpuMemoryBufferManager

cc/test/test_gpu_memory_buffer_manager.cc

 // Copyright 2014 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 "cc/test/test_gpu_memory_buffer_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/logging.h"
@@ skipping 111 matching lines @@
   gfx::GpuMemoryBufferId id_;
   gfx::GpuMemoryBuffer* client_buffer_;
 };
 
 }  // namespace
 
 TestGpuMemoryBufferManager::TestGpuMemoryBufferManager() {
 }
 
 TestGpuMemoryBufferManager::~TestGpuMemoryBufferManager() {
-  DCHECK(buffers_.empty());
+  {
+    base::AutoLock hold(buffers_lock_);
+    DCHECK(buffers_.empty());
+  }
   DCHECK(clients_.empty());
   if (parent_gpu_memory_buffer_manager_)
     parent_gpu_memory_buffer_manager_->clients_.erase(client_id_);
 }
 
 std::unique_ptr<TestGpuMemoryBufferManager>
 TestGpuMemoryBufferManager::CreateClientGpuMemoryBufferManager() {
   std::unique_ptr<TestGpuMemoryBufferManager> client(
       new TestGpuMemoryBufferManager);
   client->client_id_ = ++last_client_id_;
   client->parent_gpu_memory_buffer_manager_ = this;
 
   clients_[client->client_id_] = client.get();
   return client;
 }
 
 void TestGpuMemoryBufferManager::OnGpuMemoryBufferDestroyed(
     gfx::GpuMemoryBufferId gpu_memory_buffer_id) {
+  base::AutoLock hold(buffers_lock_);
   DCHECK(buffers_.find(gpu_memory_buffer_id.id) != buffers_.end());
   buffers_.erase(gpu_memory_buffer_id.id);
 }
 
 std::unique_ptr<gfx::GpuMemoryBuffer>
 TestGpuMemoryBufferManager::CreateGpuMemoryBuffer(
     const gfx::Size& size,
     gfx::BufferFormat format,
     gfx::BufferUsage usage,
     gpu::SurfaceHandle surface_handle) {
   std::unique_ptr<base::SharedMemory> shared_memory(new base::SharedMemory);
   const size_t buffer_size = gfx::BufferSizeForBufferFormat(size, format);
   if (!shared_memory->CreateAnonymous(buffer_size))
     return nullptr;
 
   last_gpu_memory_buffer_id_ += 1;
   std::unique_ptr<gfx::GpuMemoryBuffer> result(new GpuMemoryBufferImpl(
       this, last_gpu_memory_buffer_id_, size, format, std::move(shared_memory),
       0, base::checked_cast<int>(
              gfx::RowSizeForBufferFormat(size.width(), format, 0))));
-  buffers_[last_gpu_memory_buffer_id_] = result.get();
+  {

[vmpstr, 2017/02/09 20:37:16]

nit: don't need braces here, I don't think?

[danakj, 2017/02/09 20:39:43]

tru

+    base::AutoLock hold(buffers_lock_);
+    buffers_[last_gpu_memory_buffer_id_] = result.get();
+  }
   return result;
 }
 
 void TestGpuMemoryBufferManager::SetDestructionSyncToken(
     gfx::GpuMemoryBuffer* buffer,
     const gpu::SyncToken& sync_token) {}
 
 }  // namespace cc