| Index: cc/resources/resource_provider_unittest.cc
|
| diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
|
| index f42f64731c1166895cf8c42df0a1bfee00e7a52a..b8d1f5f97948d05bb8ceb226b50c1fac0e287dae 100644
|
| --- a/cc/resources/resource_provider_unittest.cc
|
| +++ b/cc/resources/resource_provider_unittest.cc
|
| @@ -665,7 +665,7 @@ TEST_P(ResourceProviderTest, TransferGLResources) {
|
| {
|
| ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock(
|
| child_resource_provider_.get(), id3);
|
| - EXPECT_TRUE(lock.GetGpuMemoryBuffer());
|
| + EXPECT_TRUE(lock.AllocateGpuMemoryBuffer(false));
|
| }
|
|
|
| GLuint external_texture_id = child_context_->createExternalTexture();
|
| @@ -920,7 +920,7 @@ TEST_P(ResourceProviderTestNoSyncPoint, TransferGLResources) {
|
| // point.
|
| ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock(
|
| child_resource_provider_.get(), id2);
|
| - EXPECT_TRUE(lock.GetGpuMemoryBuffer());
|
| + EXPECT_TRUE(lock.AllocateGpuMemoryBuffer(false));
|
| }
|
|
|
| GLuint external_texture_id = child_context_->createExternalTexture();
|
| @@ -3525,7 +3525,7 @@ TEST_P(ResourceProviderTest, Image_GLTexture) {
|
| {
|
| ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock(
|
| resource_provider.get(), id);
|
| - EXPECT_TRUE(lock.GetGpuMemoryBuffer());
|
| + EXPECT_TRUE(lock.AllocateGpuMemoryBuffer(false));
|
| }
|
|
|
| EXPECT_CALL(*context, NextTextureId())
|
| @@ -3546,7 +3546,7 @@ TEST_P(ResourceProviderTest, Image_GLTexture) {
|
| {
|
| ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock(
|
| resource_provider.get(), id);
|
| - EXPECT_TRUE(lock.GetGpuMemoryBuffer());
|
| + EXPECT_TRUE(lock.gpu_memory_buffer());
|
| }
|
|
|
| EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, kTextureId)).Times(1)
|
| @@ -3612,7 +3612,7 @@ TEST_P(ResourceProviderTest, CopyResource_GLTexture) {
|
| {
|
| ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock(
|
| resource_provider.get(), source_id);
|
| - EXPECT_TRUE(lock.GetGpuMemoryBuffer());
|
| + EXPECT_TRUE(lock.AllocateGpuMemoryBuffer(false));
|
| }
|
| Mock::VerifyAndClearExpectations(context);
|
|
|
|
|