Update from https://crrev.com/312600

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 82 matching lines @@
       client_sampler_id_(104),
       client_shader_id_(105),
       client_texture_id_(106),
       client_element_buffer_id_(107),
       client_vertex_shader_id_(121),
       client_fragment_shader_id_(122),
       client_query_id_(123),
       client_vertexarray_id_(124),
       client_valuebuffer_id_(125),
       client_transformfeedback_id_(126),
+      client_sync_id_(127),
       service_renderbuffer_id_(0),
       service_renderbuffer_valid_(false),
       ignore_cached_state_for_test_(GetParam()),
       cached_color_mask_red_(true),
       cached_color_mask_green_(true),
       cached_color_mask_blue_(true),
       cached_color_mask_alpha_(true),
       cached_depth_mask_(true),
       cached_stencil_front_mask_(static_cast<GLuint>(-1)),
       cached_stencil_back_mask_(static_cast<GLuint>(-1)) {
@@ skipping 310 matching lines @@
     reset_unsafe_es3_apis_enabled = true;
   }
   EXPECT_CALL(*gl_, GenSamplers(_, _))
       .WillOnce(SetArgumentPointee<1>(kServiceSamplerId))
       .RetiresOnSaturation();
   GenHelper<cmds::GenSamplersImmediate>(client_sampler_id_);
   EXPECT_CALL(*gl_, GenTransformFeedbacks(_, _))
       .WillOnce(SetArgumentPointee<1>(kServiceTransformFeedbackId))
       .RetiresOnSaturation();
   GenHelper<cmds::GenTransformFeedbacksImmediate>(client_transformfeedback_id_);
+  DoFenceSync(client_sync_id_, kServiceSyncId);
   if (reset_unsafe_es3_apis_enabled) {
     decoder_->set_unsafe_es3_apis_enabled(false);
   }
 
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 void GLES2DecoderTestBase::ResetDecoder() {
   if (!decoder_.get())
     return;
@@ skipping 86 matching lines @@
   return IsObjectHelper<cmds::IsProgram, cmds::IsProgram::Result>(client_id);
 }
 
 void GLES2DecoderTestBase::DoDeleteProgram(
     GLuint client_id, GLuint /* service_id */) {
   cmds::DeleteProgram cmd;
   cmd.Init(client_id);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
 
+void GLES2DecoderTestBase::DoFenceSync(
+    GLuint client_id, GLuint service_id) {
+  EXPECT_CALL(*gl_, FenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0))
+      .Times(1)
+      .WillOnce(Return(reinterpret_cast<GLsync>(service_id)))
+      .RetiresOnSaturation();
+  cmds::FenceSync cmd;
+  cmd.Init(client_id);
+  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+}
+
 void GLES2DecoderTestBase::SetBucketAsCString(
     uint32 bucket_id, const char* str) {
   uint32 size = str ? (strlen(str) + 1) : 0;
   cmd::SetBucketSize cmd1;
   cmd1.Init(bucket_id, size);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd1));
   if (str) {
     memcpy(shared_memory_address_, str, size);
     cmd::SetBucketData cmd2;
     cmd2.Init(bucket_id, 0, size, kSharedMemoryId, kSharedMemoryOffset);
     EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));
     ClearSharedMemory();
   }
 }
 
+void GLES2DecoderTestBase::SetBucketAsCStrings(
+    uint32 bucket_id, GLsizei count, const char** str,
+    GLsizei count_in_header, char str_end) {
+  uint32_t header_size = sizeof(GLint) * (count + 1);
+  uint32_t total_size = header_size;
+  scoped_ptr<GLint[]> header(new GLint[count + 1]);
+  header[0] = static_cast<GLint>(count_in_header);
+  for (GLsizei ii = 0; ii < count; ++ii) {
+    header[ii + 1] = str && str[ii] ? strlen(str[ii]) : 0;
+    total_size += header[ii + 1] + 1;
+  }
+  cmd::SetBucketSize cmd1;
+  cmd1.Init(bucket_id, total_size);
+  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd1));
+  memcpy(shared_memory_address_, header.get(), header_size);
+  uint32_t offset = header_size;
+  for (GLsizei ii = 0; ii < count; ++ii) {
+    if (str && str[ii]) {
+      size_t str_len = strlen(str[ii]);
+      memcpy(reinterpret_cast<char*>(shared_memory_address_) + offset,
+             str[ii], str_len);
+      offset += str_len;
+    }
+    memcpy(reinterpret_cast<char*>(shared_memory_address_) + offset,
+           &str_end, 1);
+    offset += 1;
+  }
+  cmd::SetBucketData cmd2;
+  cmd2.Init(bucket_id, 0, total_size, kSharedMemoryId, kSharedMemoryOffset);
+  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));
+  ClearSharedMemory();
+}
+
 void GLES2DecoderTestBase::SetupClearTextureExpectations(
       GLuint service_id,
       GLuint old_service_id,
       GLenum bind_target,
       GLenum target,
       GLint level,
       GLenum internal_format,
       GLenum format,
       GLenum type,
       GLsizei width,
@@ skipping 703 matching lines @@
 const GLuint GLES2DecoderTestBase::kServiceFramebufferId;
 const GLuint GLES2DecoderTestBase::kServiceRenderbufferId;
 const GLuint GLES2DecoderTestBase::kServiceSamplerId;
 const GLuint GLES2DecoderTestBase::kServiceTextureId;
 const GLuint GLES2DecoderTestBase::kServiceProgramId;
 const GLuint GLES2DecoderTestBase::kServiceShaderId;
 const GLuint GLES2DecoderTestBase::kServiceElementBufferId;
 const GLuint GLES2DecoderTestBase::kServiceQueryId;
 const GLuint GLES2DecoderTestBase::kServiceVertexArrayId;
 const GLuint GLES2DecoderTestBase::kServiceTransformFeedbackId;
+const GLuint GLES2DecoderTestBase::kServiceSyncId;
 
 const int32 GLES2DecoderTestBase::kSharedMemoryId;
 const size_t GLES2DecoderTestBase::kSharedBufferSize;
 const uint32 GLES2DecoderTestBase::kSharedMemoryOffset;
 const int32 GLES2DecoderTestBase::kInvalidSharedMemoryId;
 const uint32 GLES2DecoderTestBase::kInvalidSharedMemoryOffset;
 const uint32 GLES2DecoderTestBase::kInitialResult;
 const uint8 GLES2DecoderTestBase::kInitialMemoryValue;
 
 const uint32 GLES2DecoderTestBase::kNewClientId;
@@ skipping 409 matching lines @@
   SetupDefaultProgram();
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu