Move WebGL1 attachment image type / attachment point matching check to command buffer.

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 d744776429671e97c1189e52e6c964b9d4f9df1b..b6285b702e14af9a3418865800412644df52934b 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
@@ -1297,10 +1297,23 @@ void GLES2DecoderTestBase::DoFramebufferRenderbuffer(
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
-  EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(
-      target, attachment, renderbuffer_target, renderbuffer_service_id))
-      .Times(1)
-      .RetiresOnSaturation();
+  if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
+    EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(
+        target, GL_DEPTH_ATTACHMENT, renderbuffer_target,
+        renderbuffer_service_id))
+        .Times(1)
+        .RetiresOnSaturation();
+    EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(
+        target, GL_STENCIL_ATTACHMENT, renderbuffer_target,
+        renderbuffer_service_id))
+        .Times(1)
+        .RetiresOnSaturation();
+  } else {
+    EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(
+        target, attachment, renderbuffer_target, renderbuffer_service_id))
+        .Times(1)
+        .RetiresOnSaturation();
+  }
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(error))
       .RetiresOnSaturation();