Move special DEPTH_STENCIL attachment logic from command buffers to WebGL1

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
index d19ae397292e002f3a6d6e9e6fcb0037462924bb..7714f82ab9b4866ecbd10b7fd265d998f65e2c34 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
@@ -1384,20 +1384,26 @@ void GLES2DecoderTestBase::DoFramebufferRenderbuffer(
         renderbuffer_service_id))
         .Times(1)
         .RetiresOnSaturation();
+    EXPECT_CALL(*gl_, GetError())
+        .WillOnce(Return(error))
+        .RetiresOnSaturation();
     EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(
         target, GL_STENCIL_ATTACHMENT, renderbuffer_target,
         renderbuffer_service_id))
         .Times(1)
         .RetiresOnSaturation();
+    EXPECT_CALL(*gl_, GetError())
+        .WillOnce(Return(error))
+        .RetiresOnSaturation();
   } else {
     EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(
         target, attachment, renderbuffer_target, renderbuffer_service_id))
         .Times(1)
         .RetiresOnSaturation();
+    EXPECT_CALL(*gl_, GetError())
+        .WillOnce(Return(error))
+        .RetiresOnSaturation();
   }
-  EXPECT_CALL(*gl_, GetError())
-      .WillOnce(Return(error))
-      .RetiresOnSaturation();
   cmds::FramebufferRenderbuffer cmd;
   cmd.Init(target, attachment, renderbuffer_target, renderbuffer_client_id);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));