cc: Remove ScopedReadLockGpuMemoryBuffer

cc/resources/resource_provider_unittest.cc

Index: cc/resources/resource_provider_unittest.cc
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
index 891844c6e529f1b7b1456934093fca56567f6f19..6916447123f625fb6fb2bdcb61e7d7795f57d1e9 100644
--- a/cc/resources/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_unittest.cc
@@ -3707,137 +3707,5 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) {
   }
 }
 
-TEST_P(ResourceProviderTest, GpuMemoryBufferReadLockFail) {
-  if (GetParam() != ResourceProvider::RESOURCE_TYPE_GL_TEXTURE)
-    return;
-
-  gfx::Size size(1, 1);
-  ResourceFormat format = RGBA_8888;
-  size_t pixel_size = TextureSizeBytes(size, format);
-  ASSERT_EQ(4U, pixel_size);
-
-  ResourceId id = resource_provider_->CreateResource(
-      size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format);
-  resource_provider_->AllocateForTesting(id);
-  {
-    ResourceProvider::ScopedReadLockGpuMemoryBuffer lock(
-        resource_provider_.get(), id);
-    EXPECT_FALSE(lock.gpu_memory_buffer());
-  }
-}
-
-TEST_P(ResourceProviderTest, GpuMemoryBufferReadLockSucceed) {
-  if (GetParam() != ResourceProvider::RESOURCE_TYPE_GL_TEXTURE)
-    return;
-
-  gfx::Size size(1, 1);
-  ResourceFormat format = RGBA_8888;
-  size_t pixel_size = TextureSizeBytes(size, format);
-  ASSERT_EQ(4U, pixel_size);
-
-  ResourceId id = resource_provider_->CreateResource(
-      size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format);
-  gfx::GpuMemoryBuffer* gpu_memory_buffer = nullptr;
-  {
-    ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock(
-        resource_provider_.get(), id);
-    gpu_memory_buffer = lock.GetGpuMemoryBuffer();
-    EXPECT_TRUE(lock.GetGpuMemoryBuffer());
-  }
-  {
-    ResourceProvider::ScopedReadLockGpuMemoryBuffer lock(
-        resource_provider_.get(), id);
-    EXPECT_EQ(gpu_memory_buffer, lock.gpu_memory_buffer());
-  }
-}
-
-TEST_P(ResourceProviderTest, ChildGpuMemoryBufferReadLock) {
-  if (GetParam() != ResourceProvider::RESOURCE_TYPE_GL_TEXTURE)
-    return;
-
-  gfx::Size size(1, 1);
-  ResourceFormat format = RGBA_8888;
-  size_t pixel_size = TextureSizeBytes(size, format);
-  ASSERT_EQ(4U, pixel_size);
-
-  // Create the child resource provider.
-  ReturnedResourceArray returned_to_child;
-  int child_id = resource_provider_->CreateChild(
-      GetReturnCallback(&returned_to_child),
-      child_gpu_memory_buffer_manager_->GetClientId());
-
-  // Create a non-GMB-backed resource.
-  ResourceId child_resource = child_resource_provider_->CreateResource(
-      size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format);
-  {
-    uint8_t data1[4] = {1, 2, 3, 4};
-    child_resource_provider_->CopyToResource(child_resource, data1, size);
-  }
-
-  // Create a GMB-backed resource.
-  ResourceId child_gmb_resource = child_resource_provider_->CreateResource(
-      size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format);
-  gfx::GpuMemoryBuffer* child_gmb = nullptr;
-  {
-    ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock(
-        child_resource_provider_.get(), child_gmb_resource);
-    EXPECT_TRUE(lock.GetGpuMemoryBuffer());
-    child_gmb = lock.GetGpuMemoryBuffer();
-  }
-
-  // Transfer to the parent.
-  TransferableResourceArray list;
-  {
-    ResourceProvider::ResourceIdArray resource_ids_to_transfer;
-    resource_ids_to_transfer.push_back(child_resource);
-    resource_ids_to_transfer.push_back(child_gmb_resource);
-    child_resource_provider_->GenerateSyncTokenForResources(
-        resource_ids_to_transfer);
-    child_resource_provider_->PrepareSendToParent(resource_ids_to_transfer,
-                                                  &list);
-    resource_provider_->ReceiveFromChild(child_id, list);
-    resource_provider_->WaitSyncTokenIfNeeded(list[0].id);
-    resource_provider_->WaitSyncTokenIfNeeded(list[1].id);
-  }
-
-  // The non-gmb resource should not have a GpuMemoryBuffer when locked.
-  {
-    ResourceProvider::ScopedReadLockGpuMemoryBuffer lock(
-        resource_provider_.get(), list[0].id);
-    EXPECT_FALSE(lock.gpu_memory_buffer());
-  }
-
-  // The gmb resource should have a GpuMemoryBuffer when locked
-  {
-    ResourceProvider::ScopedReadLockGpuMemoryBuffer lock(
-        resource_provider_.get(), list[1].id);
-    gfx::GpuMemoryBuffer* parent_gmb = lock.gpu_memory_buffer();
-    EXPECT_TRUE(parent_gmb);
-    EXPECT_NE(child_gmb, parent_gmb);
-
-    // Verify that the IsInUseByMacOSWindowServer signal is shared between
-    // parent and child.
-    EXPECT_FALSE(parent_gmb->IsInUseByMacOSWindowServer());
-    child_gpu_memory_buffer_manager_
-        ->SetGpuMemoryBufferIsInUseByMacOSWindowServer(child_gmb, true);
-    EXPECT_TRUE(parent_gmb->IsInUseByMacOSWindowServer());
-    child_gpu_memory_buffer_manager_
-        ->SetGpuMemoryBufferIsInUseByMacOSWindowServer(child_gmb, false);
-    EXPECT_FALSE(parent_gmb->IsInUseByMacOSWindowServer());
-  }
-
-  // Transfer back to the child.{
-  {
-    ResourceProvider::ResourceIdSet resource_ids_to_receive;
-    resource_ids_to_receive.insert(child_resource);
-    resource_ids_to_receive.insert(child_gmb_resource);
-    resource_provider_->DeclareUsedResourcesFromChild(child_id,
-                                                      resource_ids_to_receive);
-  }
-  resource_provider_->DestroyChild(child_id);
-
-  EXPECT_EQ(0u, resource_provider_->num_resources());
-}
-
 }  // namespace
 }  // namespace cc