Implement new behavior for DescheduleUntilFinishedCHROMIUM.

gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
index 53a11eaba5d49a3cd6c1da3a69a9838a107dca05..07e845099fef1266cda870ec039281395a95eafc 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
@@ -1718,14 +1718,18 @@ class GLES2DecoderDescheduleUntilFinishedTest : public GLES2DecoderTest {
                    base::Unretained(this)));
 
     EXPECT_CALL(*gl_, FenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0))
-        .Times(1)
+        .Times(2)
         .WillOnce(Return(sync_service_id_))
+        .WillOnce(Return(sync_service_id2_))
         .RetiresOnSaturation();
     EXPECT_CALL(*gl_, IsSync(sync_service_id_)).WillRepeatedly(Return(GL_TRUE));
-    EXPECT_CALL(*gl_, Flush()).RetiresOnSaturation();
+    EXPECT_CALL(*gl_, Flush()).Times(2).RetiresOnSaturation();
     EXPECT_CALL(*gl_, DeleteSync(sync_service_id_))
         .Times(1)
         .RetiresOnSaturation();
+    EXPECT_CALL(*gl_, DeleteSync(sync_service_id2_))
+        .Times(1)
+        .RetiresOnSaturation();
   }
 
   void DescheduleUntilFinishedCallback() {
@@ -1739,6 +1743,7 @@ class GLES2DecoderDescheduleUntilFinishedTest : public GLES2DecoderTest {
   int deschedule_until_finished_callback_count_ = 0;
   int reschedule_after_finished_callback_count_ = 0;
   GLsync sync_service_id_ = reinterpret_cast<GLsync>(0x15);
+  GLsync sync_service_id2_ = reinterpret_cast<GLsync>(0x15);
 };
 
 TEST_P(GLES2DecoderDescheduleUntilFinishedTest, AlreadySignalled) {
@@ -1752,6 +1757,10 @@ TEST_P(GLES2DecoderDescheduleUntilFinishedTest, AlreadySignalled) {
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(0, deschedule_until_finished_callback_count_);
   EXPECT_EQ(0, reschedule_after_finished_callback_count_);
+
+  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+  EXPECT_EQ(0, deschedule_until_finished_callback_count_);
+  EXPECT_EQ(0, reschedule_after_finished_callback_count_);
 }
 
 TEST_P(GLES2DecoderDescheduleUntilFinishedTest, NotYetSignalled) {
@@ -1762,6 +1771,10 @@ TEST_P(GLES2DecoderDescheduleUntilFinishedTest, NotYetSignalled) {
 
   cmds::DescheduleUntilFinishedCHROMIUM cmd;
   cmd.Init();
+  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+  EXPECT_EQ(0, deschedule_until_finished_callback_count_);
+  EXPECT_EQ(0, reschedule_after_finished_callback_count_);
+
   EXPECT_EQ(error::kDeferLaterCommands, ExecuteCmd(cmd));
   EXPECT_EQ(1, deschedule_until_finished_callback_count_);
   EXPECT_EQ(0, reschedule_after_finished_callback_count_);