| Index: cc/resources/resource_provider_unittest.cc
|
| diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
|
| index b8426c07e76e9edef929361b5d29f06f3f0a831e..89e9314036b7326b42f3bef0edaa55b61c510140 100644
|
| --- a/cc/resources/resource_provider_unittest.cc
|
| +++ b/cc/resources/resource_provider_unittest.cc
|
| @@ -3749,7 +3749,7 @@ TEST_P(ResourceProviderTest, GpuMemoryBufferReadLockFail) {
|
| {
|
| ResourceProvider::ScopedReadLockGpuMemoryBuffer lock(
|
| resource_provider_.get(), id);
|
| - EXPECT_FALSE(lock.GetGpuMemoryBuffer());
|
| + EXPECT_FALSE(lock.gpu_memory_buffer());
|
| }
|
| }
|
|
|
| @@ -3774,7 +3774,7 @@ TEST_P(ResourceProviderTest, GpuMemoryBufferReadLockSucceed) {
|
| {
|
| ResourceProvider::ScopedReadLockGpuMemoryBuffer lock(
|
| resource_provider_.get(), id);
|
| - EXPECT_EQ(gpu_memory_buffer, lock.GetGpuMemoryBuffer());
|
| + EXPECT_EQ(gpu_memory_buffer, lock.gpu_memory_buffer());
|
| }
|
| }
|
|
|
| @@ -3831,14 +3831,14 @@ TEST_P(ResourceProviderTest, ChildGpuMemoryBufferReadLock) {
|
| {
|
| ResourceProvider::ScopedReadLockGpuMemoryBuffer lock(
|
| resource_provider_.get(), list[0].id);
|
| - EXPECT_FALSE(lock.GetGpuMemoryBuffer());
|
| + 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.GetGpuMemoryBuffer();
|
| + gfx::GpuMemoryBuffer* parent_gmb = lock.gpu_memory_buffer();
|
| EXPECT_TRUE(parent_gmb);
|
| EXPECT_NE(child_gmb, parent_gmb);
|
|
|
|
|