command_buffer: Add support for creating non-WebGL ES 3 contexts

gpu/command_buffer/tests/gl_program_unittest.cc

 // Copyright 2014 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 <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/tests/gl_manager.h"
 #include "gpu/command_buffer/tests/gl_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #define SHADER(Src) #Src
 
 namespace gpu {
 
 class GLProgramTest : public testing::Test {
  protected:
   void SetUp() override { gl_.Initialize(GLManager::Options()); }
 
   void TearDown() override { gl_.Destroy(); }
-
   GLManager gl_;
 };
 
 class WebGLProgramTest : public GLProgramTest {
  protected:
   void SetUp() override {
     GLManager::Options options;
-    options.webgl_version = 1;
+    options.context_type = GLManager::CONTEXT_TYPE_WEBGL1;
     gl_.Initialize(options);
   }
 };
 
 TEST_F(GLProgramTest, GetSetUniform) {
   static const char* v_shader_str = SHADER(
       attribute vec4 a_vertex;
       attribute vec3 a_normal;
 
       uniform mat4 u_modelViewProjMatrix;
@@ skipping 228 matching lines @@
 
   glLinkProgram(program);
 
   GLint linked = 0;
   glGetProgramiv(program, GL_LINK_STATUS, &linked);
   EXPECT_NE(0, linked);
 }
 
 }  // namespace gpu