cc: Lock access to |buffers_| in TestGpuMemoryBufferManager

cc/test/test_gpu_memory_buffer_manager.cc

Index: cc/test/test_gpu_memory_buffer_manager.cc
diff --git a/cc/test/test_gpu_memory_buffer_manager.cc b/cc/test/test_gpu_memory_buffer_manager.cc
index fb6899f81d137319173a35267fee37888a78ae2a..fe656a0ff981939aaf63738a1ec0422947b05a46 100644
--- a/cc/test/test_gpu_memory_buffer_manager.cc
+++ b/cc/test/test_gpu_memory_buffer_manager.cc
@@ -129,7 +129,10 @@ 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_);
@@ -148,6 +151,7 @@ TestGpuMemoryBufferManager::CreateClientGpuMemoryBufferManager() {
 
 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);
 }
@@ -168,7 +172,10 @@ TestGpuMemoryBufferManager::CreateGpuMemoryBuffer(
       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;
 }