Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc |
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc |
index 65925351969071ecd4110c890ebe81fd6346bbfc..3d458b26e370c91e948e5089c54ff7479a46a416 100644 |
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc |
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc |
@@ -236,6 +236,14 @@ void GLES2DecoderTestBase::InitDecoder( |
.Times(1) |
.RetiresOnSaturation(); |
+#if defined(OS_ANDROID) |
epenner
2013/05/23 18:13:42
You can get rid of this by making a function IsQua
|
+ // The Android AsyncPixelTransferDelegate can disable itself based on the GL |
+ // vendor. |
+ EXPECT_CALL(*gl_, GetString(GL_VENDOR)) |
+ .WillOnce(Return(reinterpret_cast<const uint8*>(""))) |
+ .RetiresOnSaturation(); |
+#endif |
+ |
engine_.reset(new StrictMock<MockCommandBufferEngine>()); |
gpu::Buffer buffer = engine_->GetSharedMemoryBuffer(kSharedMemoryId); |
shared_memory_offset_ = kSharedMemoryOffset; |