gpu: Use decoder state restoration for scoped_binders

gpu/command_buffer/service/gles2_cmd_decoder_mock.h

Index: gpu/command_buffer/service/gles2_cmd_decoder_mock.h
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_mock.h b/gpu/command_buffer/service/gles2_cmd_decoder_mock.h
index 64ca1a8c4b465060dfd3473fe2e429666e8f806f..7f6e5cf639b5b3d4986aa68349227ff114bc1e4d 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_mock.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_mock.h
@@ -82,6 +82,7 @@ class MockGLES2Decoder : public GLES2Decoder {
   MOCK_CONST_METHOD1(
       RestoreActiveTextureUnitBinding, void(unsigned int target));
   MOCK_METHOD0(RestoreAllExternalTextureBindingsIfNeeded, void());
+  MOCK_CONST_METHOD1(RestoreBufferBinding, void(unsigned int target));
   MOCK_CONST_METHOD0(RestoreBufferBindings, void());
   MOCK_CONST_METHOD0(RestoreFramebufferBindings, void());
   MOCK_CONST_METHOD0(RestoreGlobalState, void());
@@ -89,6 +90,7 @@ class MockGLES2Decoder : public GLES2Decoder {
   MOCK_METHOD0(RestoreRenderbufferBindings, void());
   MOCK_CONST_METHOD1(RestoreTextureState, void(unsigned service_id));
   MOCK_CONST_METHOD1(RestoreTextureUnitBindings, void(unsigned unit));
+  MOCK_METHOD1(RestoreVertexAttribArray, void(unsigned index));
   MOCK_CONST_METHOD0(ClearAllAttributes, void());
   MOCK_CONST_METHOD0(RestoreAllAttributes, void());
   MOCK_METHOD0(GetQueryManager, gpu::gles2::QueryManager*());