Update from https://crrev.com/314320

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 39 matching lines @@
       "GL_ARB_vertex_array_object",
       "GL_APPLE_vertex_array_object"
   };
   bool contains_vao_extension = false;
   for (size_t ii = 0; ii < arraysize(kVAOExtensions); ++ii) {
     if (init->extensions.find(kVAOExtensions[ii]) != std::string::npos) {
       contains_vao_extension = true;
       break;
     }
   }
+
   if (init->use_native_vao) {
     if (contains_vao_extension)
       return;
     if (!init->extensions.empty())
       init->extensions += " ";
     if (StartsWithASCII(init->gl_version, "opengl es", false)) {
       init->extensions += kVAOExtensions[0];
     } else {
 #if !defined(OS_MACOSX)
       init->extensions += kVAOExtensions[1];
 #else
       init->extensions += kVAOExtensions[2];
 #endif  // OS_MACOSX
     }
   } else {
     // Make sure we don't set up an invalid InitState.
     CHECK(!contains_vao_extension);
   }
+
+  if (!init->extensions.empty())
+    init->extensions += " ";
+  init->extensions += "GL_EXT_framebuffer_object ";
 }
 
 }  // namespace Anonymous
 
 namespace gpu {
 namespace gles2 {
 
 GLES2DecoderTestBase::GLES2DecoderTestBase()
     : surface_(NULL),
       context_(NULL),
@@ skipping 23 matching lines @@
       cached_depth_mask_(true),
       cached_stencil_front_mask_(static_cast<GLuint>(-1)),
       cached_stencil_back_mask_(static_cast<GLuint>(-1)) {
   memset(immediate_buffer_, 0xEE, sizeof(immediate_buffer_));
 }
 
 GLES2DecoderTestBase::~GLES2DecoderTestBase() {}
 
 void GLES2DecoderTestBase::SetUp() {
   InitState init;
-  init.gl_version = "3.0";
+  // Autogenerated tests do not overwrite version or extension string,
+  // so we have to pick something that supports everything here.
+  init.gl_version = "4.4";
   init.has_alpha = true;
   init.has_depth = true;
   init.request_alpha = true;
   init.request_depth = true;
   init.bind_generates_resource = true;
   InitDecoder(init);
 }
 
 void GLES2DecoderTestBase::AddExpectationsForVertexAttribManager() {
   for (GLint ii = 0; ii < kNumVertexAttribs; ++ii) {
     EXPECT_CALL(*gl_, VertexAttrib4f(ii, 0.0f, 0.0f, 0.0f, 1.0f))
         .Times(1)
         .RetiresOnSaturation();
   }
 }
 
 GLES2DecoderTestBase::InitState::InitState()
-    : has_alpha(false),
+    : extensions("GL_EXT_framebuffer_object"),
+      gl_version("2.1"),
+      has_alpha(false),
       has_depth(false),
       has_stencil(false),
       request_alpha(false),
       request_depth(false),
       request_stencil(false),
       bind_generates_resource(false),
       lose_context_when_out_of_memory(false),
       use_native_vao(true) {
 }
 
 void GLES2DecoderTestBase::InitDecoder(const InitState& init) {
   InitDecoderWithCommandLine(init, NULL);
 }
 
 void GLES2DecoderTestBase::InitDecoderWithCommandLine(
     const InitState& init,
     const base::CommandLine* command_line) {
   InitState normalized_init = init;
   NormalizeInitState(&normalized_init);
+  // For easier substring/extension matching
+  DCHECK(normalized_init.extensions.empty() ||
+         *normalized_init.extensions.rbegin() == ' ');
   Framebuffer::ClearFramebufferCompleteComboMap();
 
   gfx::SetGLGetProcAddressProc(gfx::MockGLInterface::GetGLProcAddress);
   gfx::GLSurface::InitializeOneOffWithMockBindingsForTests();
 
   gl_.reset(new StrictMock<MockGLInterface>());
   ::gfx::MockGLInterface::SetGLInterface(gl_.get());
 
   SetupMockGLBehaviors();
 
-  // Only create stream texture manager if extension is requested.
-  std::vector<std::string> list;
-  base::SplitString(normalized_init.extensions, ' ', &list);
   scoped_refptr<FeatureInfo> feature_info;
   if (command_line)
     feature_info = new FeatureInfo(*command_line);
   group_ = scoped_refptr<ContextGroup>(
       new ContextGroup(NULL,
                        memory_tracker_,
                        new ShaderTranslatorCache,
                        feature_info.get(),
                        new SubscriptionRefSet,
                        new ValueStateMap,
@@ skipping 234 matching lines @@
 
   DoCreateProgram(client_program_id_, kServiceProgramId);
   DoCreateShader(GL_VERTEX_SHADER, client_shader_id_, kServiceShaderId);
 
   // Unsafe commands.
   bool reset_unsafe_es3_apis_enabled = false;
   if (!decoder_->unsafe_es3_apis_enabled()) {
     decoder_->set_unsafe_es3_apis_enabled(true);
     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);
+
+  const gfx::GLVersionInfo* version = context_->GetVersionInfo();
+  if (version->IsAtLeastGL(3, 3) || version->IsAtLeastGLES(3, 0)) {
+    EXPECT_CALL(*gl_, GenSamplers(_, _))
+        .WillOnce(SetArgumentPointee<1>(kServiceSamplerId))
+        .RetiresOnSaturation();
+    GenHelper<cmds::GenSamplersImmediate>(client_sampler_id_);
+  }
+  if (version->IsAtLeastGL(4, 0) || version->IsAtLeastGLES(3, 0)) {
+    EXPECT_CALL(*gl_, GenTransformFeedbacks(_, _))
+        .WillOnce(SetArgumentPointee<1>(kServiceTransformFeedbackId))
+        .RetiresOnSaturation();
+    GenHelper<cmds::GenTransformFeedbacksImmediate>(
+        client_transformfeedback_id_);
+  }
+
+  if (init.extensions.find("GL_ARB_sync ") != std::string::npos ||
+      version->IsAtLeastGL(3, 2) || version->IsAtLeastGLES(3, 0)) {
+    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 1298 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