Index: gpu/command_buffer/client/gles2_implementation_unittest.cc |
diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc |
index ef2efeba0f2d77c10897288996f3d8c2f7315c56..c59db58aefd0c5830b6a397c17abba46032a6618 100644 |
--- a/gpu/command_buffer/client/gles2_implementation_unittest.cc |
+++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc |
@@ -3782,6 +3782,8 @@ TEST_F(GLES2ImplementationTest, GenSyncTokenCHROMIUM) { |
.WillRepeatedly(testing::Return(kNamespaceId)); |
EXPECT_CALL(*gpu_control_, GetCommandBufferID()) |
.WillRepeatedly(testing::Return(kCommandBufferId)); |
+ EXPECT_CALL(*gpu_control_, GetExtraCommandBufferData()) |
+ .WillRepeatedly(testing::Return(0)); |
gl_->GenSyncTokenCHROMIUM(kFenceSync, nullptr); |
EXPECT_EQ(GL_INVALID_VALUE, CheckError()); |
@@ -3825,6 +3827,8 @@ TEST_F(GLES2ImplementationTest, GenUnverifiedSyncTokenCHROMIUM) { |
.WillRepeatedly(testing::Return(kNamespaceId)); |
EXPECT_CALL(*gpu_control_, GetCommandBufferID()) |
.WillRepeatedly(testing::Return(kCommandBufferId)); |
+ EXPECT_CALL(*gpu_control_, GetExtraCommandBufferData()) |
+ .WillRepeatedly(testing::Return(0)); |
gl_->GenUnverifiedSyncTokenCHROMIUM(kFenceSync, nullptr); |
EXPECT_EQ(GL_INVALID_VALUE, CheckError()); |
@@ -3872,6 +3876,8 @@ TEST_F(GLES2ImplementationTest, WaitSyncTokenCHROMIUM) { |
.WillOnce(testing::Return(kNamespaceId)); |
EXPECT_CALL(*gpu_control_, GetCommandBufferID()) |
.WillOnce(testing::Return(kCommandBufferId)); |
+ EXPECT_CALL(*gpu_control_, GetExtraCommandBufferData()) |
+ .WillOnce(testing::Return(0)); |
gl_->GenSyncTokenCHROMIUM(kFenceSync, sync_token); |
struct Cmds { |
@@ -3899,14 +3905,14 @@ TEST_F(GLES2ImplementationTest, WaitSyncTokenCHROMIUMErrors) { |
// Invalid sync tokens should produce no error and be a nop. |
ClearCommands(); |
- gpu::SyncToken invalid_sync_token(CommandBufferNamespace::INVALID, 0, 0); |
+ gpu::SyncToken invalid_sync_token; |
gl_->WaitSyncTokenCHROMIUM(invalid_sync_token.GetConstData()); |
EXPECT_TRUE(NoCommandsWritten()); |
EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), gl_->GetError()); |
// Unverified sync token should produce INVALID_OPERATION. |
ClearCommands(); |
- gpu::SyncToken unverified_sync_token(CommandBufferNamespace::GPU_IO, 0, 0); |
+ gpu::SyncToken unverified_sync_token(CommandBufferNamespace::GPU_IO, 0, 0, 0); |
EXPECT_CALL(*gpu_control_, CanWaitUnverifiedSyncToken(_)) |
.WillOnce(testing::Return(false)); |
gl_->WaitSyncTokenCHROMIUM(unverified_sync_token.GetConstData()); |