Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Unified Diff: gpu/command_buffer/tests/gl_gpu_memory_buffer_unittests.cc

Issue 16293004: Update gpu/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/vertex_attrib_manager.cc ('k') | gpu/config/gpu_control_list.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/tests/gl_gpu_memory_buffer_unittests.cc
diff --git a/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittests.cc b/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittests.cc
index ae2ec10aeb745f347ffdcead3b782e4416b4f32c..6f93433775212005ca44945830a6304701d9b5f5 100644
--- a/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittests.cc
+++ b/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittests.cc
@@ -43,7 +43,7 @@ class MockGpuMemoryBufferTest : public testing::Test {
image_manager_ = new ImageManager;
image_factory_.reset(
new StrictMock<ImageFactoryMock>(image_manager_));
- options.image_manager = image_manager_;
+ options.image_manager = image_manager_.get();
options.image_factory = image_factory_.get();
gl_.Initialize(options);
@@ -116,13 +116,9 @@ TEST_F(MockGpuMemoryBufferTest, Lifecycle) {
// Bind the texture and the image.
glBindTexture(GL_TEXTURE_2D, texture_id);
- EXPECT_CALL(*gl_image, BindTexImage())
- .Times(1)
- .WillOnce(Return(true))
+ EXPECT_CALL(*gl_image.get(), BindTexImage()).Times(1).WillOnce(Return(true))
.RetiresOnSaturation();
- EXPECT_CALL(*gl_image, GetSize())
- .Times(1)
- .WillOnce(Return(size))
+ EXPECT_CALL(*gl_image.get(), GetSize()).Times(1).WillOnce(Return(size))
.RetiresOnSaturation();
glBindTexImage2DCHROMIUM(GL_TEXTURE_2D, image_id);
« no previous file with comments | « gpu/command_buffer/service/vertex_attrib_manager.cc ('k') | gpu/config/gpu_control_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698