command_buffer: Defer restoring of FBO bindings when changing virtual contexts

gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
index 258d63d4a1721acf8f96a99a192f5053f12ffa80..17d511c6a2df0be90716c0341c651be3d54216cb 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
@@ -90,14 +90,10 @@ TEST_P(GLES2DecoderWithShaderTest, BindAndDeleteFramebuffer) {
   SetupExpectationsForApplyingDefaultDirtyState();
   DoBindFramebuffer(
       GL_FRAMEBUFFER, client_framebuffer_id_, kServiceFramebufferId);
-  DoDeleteFramebuffer(client_framebuffer_id_,
-                      kServiceFramebufferId,
-                      true,
-                      GL_FRAMEBUFFER,
-                      0,
-                      true,
-                      GL_FRAMEBUFFER,
-                      0);
+  DoDeleteFramebuffer(client_framebuffer_id_, kServiceFramebufferId);
+  EXPECT_CALL(*gl_, BindFramebufferEXT(GL_FRAMEBUFFER, 0))
+      .Times(1)
+      .RetiresOnSaturation();
   EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
       .Times(1)
       .RetiresOnSaturation();
@@ -2753,14 +2749,7 @@ void GLES2DecoderWithShaderTest::CheckRenderbufferChangesMarkFBOAsNotComplete(
     EXPECT_TRUE(framebuffer_manager->IsComplete(framebuffer));
   }
   // Cleanup
-  DoDeleteFramebuffer(client_framebuffer_id_,
-                      kServiceFramebufferId,
-                      bound_fbo,
-                      GL_FRAMEBUFFER,
-                      0,
-                      bound_fbo,
-                      GL_FRAMEBUFFER,
-                      0);
+  DoDeleteFramebuffer(client_framebuffer_id_, kServiceFramebufferId);
 }
 
 TEST_P(GLES2DecoderWithShaderTest,
@@ -2803,8 +2792,6 @@ void GLES2DecoderWithShaderTest::CheckTextureChangesMarkFBOAsNotComplete(
 
   DoBindRenderbuffer(
       GL_RENDERBUFFER, client_renderbuffer_id_, kServiceRenderbufferId);
-  DoBindFramebuffer(
-      GL_FRAMEBUFFER, client_framebuffer_id_, kServiceFramebufferId);
   DoRenderbufferStorage(GL_RENDERBUFFER,
                         GL_DEPTH_COMPONENT16,
                         GL_DEPTH_COMPONENT,
@@ -2869,14 +2856,7 @@ void GLES2DecoderWithShaderTest::CheckTextureChangesMarkFBOAsNotComplete(
     EXPECT_TRUE(framebuffer_manager->IsComplete(framebuffer));
   }
   // Cleanup
-  DoDeleteFramebuffer(client_framebuffer_id_,
-                      kServiceFramebufferId,
-                      bound_fbo,
-                      GL_FRAMEBUFFER,
-                      0,
-                      bound_fbo,
-                      GL_FRAMEBUFFER,
-                      0);
+  DoDeleteFramebuffer(client_framebuffer_id_, kServiceFramebufferId);
 }
 
 TEST_P(GLES2DecoderWithShaderTest, TextureChangesMarkFBOAsNotCompleteBoundFBO) {