Split DEPTH_STENCIL into DEPTH and STENCIL in command buffer

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 dda301aeb5c2c342a0036ad715e7d80a4963a7a7..3a9907063120b97f09b41a74d682081ab3109168 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
@@ -2024,7 +2024,9 @@ TEST_P(GLES3DecoderTest, ClearBufferfiValidArgs) {
   Framebuffer* framebuffer =
       group().framebuffer_manager()->GetFramebuffer(client_framebuffer_id_);
   framebuffer->MarkAttachmentAsCleared(group().renderbuffer_manager(), nullptr,
-                                       GL_DEPTH_STENCIL_ATTACHMENT, true);
+                                       GL_DEPTH_ATTACHMENT, true);
+  framebuffer->MarkAttachmentAsCleared(group().renderbuffer_manager(), nullptr,
+                                       GL_STENCIL_ATTACHMENT, true);
 
   Enable cmd_enable;
   cmd_enable.Init(GL_STENCIL_TEST);
@@ -3404,6 +3406,10 @@ TEST_P(GLES3DecoderTest, FramebufferTextureLayerValidArgs) {
                                             kServiceTextureId, 4, 5))
       .Times(1)
       .RetiresOnSaturation();
+  EXPECT_CALL(*gl_, GetError())
+      .WillOnce(Return(GL_NO_ERROR))
+      .WillOnce(Return(GL_NO_ERROR))
+      .RetiresOnSaturation();
   cmds::FramebufferTextureLayer cmd;
   cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, client_texture_id_, 4, 5);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));