Pull in various gpu/command_buffer fixes from chromium

gpu/command_buffer/service/gles2_cmd_decoder_unittest_3.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_3.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3.cc
index 86b61ac7c3ab987d7bcf0aecceb310a867f5612a..d2ef969b25f9045f067cfe01826d1b73d140f628 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3.cc
@@ -36,6 +36,26 @@ class GLES2DecoderTest3 : public GLES2DecoderTestBase {
 
 INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderTest3, ::testing::Bool());
 
+template <>
+void GLES2DecoderTestBase::SpecializedSetup<cmds::ValidateProgram, 0>(
+    bool /* valid */) {
+  // Needs the same setup as LinkProgram.
+  SpecializedSetup<cmds::LinkProgram, 0>(false);
+
+  EXPECT_CALL(*gl_, LinkProgram(kServiceProgramId))
+      .Times(1)
+      .RetiresOnSaturation();
+
+  cmds::LinkProgram link_cmd;
+  link_cmd.Init(client_program_id_);
+  EXPECT_EQ(error::kNoError, ExecuteCmd(link_cmd));
+
+  EXPECT_CALL(*gl_,
+      GetProgramiv(kServiceProgramId, GL_INFO_LOG_LENGTH, _))
+      .WillOnce(SetArgumentPointee<2>(0))
+      .RetiresOnSaturation();
+};
+
 TEST_P(GLES2DecoderTest3, TraceBeginCHROMIUM) {
   const uint32 kCategoryBucketId = 123;
   const uint32 kNameBucketId = 234;