Update from chromium https://crrev.com/301725/

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 4efe74d205bbf561acec7c51c758c9a94a642b73..e507ad67a93558d64c805a6edc69db2be348791a 100644
--- a/cc/resources/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_unittest.cc
@@ -637,7 +637,7 @@ TEST_P(ResourceProviderTest, TransferGLResources) {
   {
     ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock(
         child_resource_provider_.get(), id3);
-    EXPECT_TRUE(!!lock.gpu_memory_buffer());
+    EXPECT_TRUE(!!lock.GetGpuMemoryBuffer());
   }
 
   GLuint external_texture_id = child_context_->createExternalTexture();
@@ -3318,7 +3318,7 @@ TEST_P(ResourceProviderTest, Image_GLTexture) {
   {
     ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock(
         resource_provider.get(), id);
-    EXPECT_TRUE(!!lock.gpu_memory_buffer());
+    EXPECT_TRUE(!!lock.GetGpuMemoryBuffer());
   }
 
   EXPECT_CALL(*context, NextTextureId())
@@ -3339,7 +3339,7 @@ TEST_P(ResourceProviderTest, Image_GLTexture) {
   {
     ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock(
         resource_provider.get(), id);
-    EXPECT_TRUE(!!lock.gpu_memory_buffer());
+    EXPECT_TRUE(!!lock.GetGpuMemoryBuffer());
   }
 
   EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, kTextureId)).Times(1)
@@ -3405,7 +3405,7 @@ TEST_P(ResourceProviderTest, CopyResource_GLTexture) {
   {
     ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock(
         resource_provider.get(), source_id);
-    EXPECT_TRUE(!!lock.gpu_memory_buffer());
+    EXPECT_TRUE(!!lock.GetGpuMemoryBuffer());
   }
   Mock::VerifyAndClearExpectations(context);