Update from https://crrev.com/320931

ui/gl/gl_bindings_autogen_mock.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.
 //
 // This file is auto-generated from
 // ui/gl/generate_bindings.py
 // It's formatted by clang-format using chromium coding style:
 //    clang-format -i -style=chromium filename
 // DO NOT EDIT!
 
@@ skipping 23 matching lines @@
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glBeginQuery(GLenum target, GLuint id) {
   MakeFunctionUnique("glBeginQuery");
   interface_->BeginQuery(target, id);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glBeginQueryARB(GLenum target, GLuint id) {
   MakeFunctionUnique("glBeginQueryARB");
-  interface_->BeginQueryARB(target, id);
+  interface_->BeginQuery(target, id);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glBeginQueryEXT(GLenum target, GLuint id) {
   MakeFunctionUnique("glBeginQueryEXT");
-  interface_->BeginQueryARB(target, id);
+  interface_->BeginQuery(target, id);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glBeginTransformFeedback(GLenum primitiveMode) {
   MakeFunctionUnique("glBeginTransformFeedback");
   interface_->BeginTransformFeedback(primitiveMode);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glBindAttribLocation(GLuint program,
@@ skipping 450 matching lines @@
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glDeleteQueries(GLsizei n, const GLuint* ids) {
   MakeFunctionUnique("glDeleteQueries");
   interface_->DeleteQueries(n, ids);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glDeleteQueriesARB(GLsizei n, const GLuint* ids) {
   MakeFunctionUnique("glDeleteQueriesARB");
-  interface_->DeleteQueriesARB(n, ids);
+  interface_->DeleteQueries(n, ids);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glDeleteQueriesEXT(GLsizei n, const GLuint* ids) {
   MakeFunctionUnique("glDeleteQueriesEXT");
-  interface_->DeleteQueriesARB(n, ids);
+  interface_->DeleteQueries(n, ids);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glDeleteRenderbuffers(GLsizei n,
                                             const GLuint* renderbuffers) {
   MakeFunctionUnique("glDeleteRenderbuffers");
   interface_->DeleteRenderbuffersEXT(n, renderbuffers);
 }
 
 void GL_BINDING_CALL
@@ skipping 228 matching lines @@
   interface_->EnableVertexAttribArray(index);
 }
 
 void GL_BINDING_CALL MockGLInterface::Mock_glEndQuery(GLenum target) {
   MakeFunctionUnique("glEndQuery");
   interface_->EndQuery(target);
 }
 
 void GL_BINDING_CALL MockGLInterface::Mock_glEndQueryARB(GLenum target) {
   MakeFunctionUnique("glEndQueryARB");
-  interface_->EndQueryARB(target);
+  interface_->EndQuery(target);
 }
 
 void GL_BINDING_CALL MockGLInterface::Mock_glEndQueryEXT(GLenum target) {
   MakeFunctionUnique("glEndQueryEXT");
-  interface_->EndQueryARB(target);
+  interface_->EndQuery(target);
 }
 
 void GL_BINDING_CALL MockGLInterface::Mock_glEndTransformFeedback(void) {
   MakeFunctionUnique("glEndTransformFeedback");
   interface_->EndTransformFeedback();
 }
 
 GLsync GL_BINDING_CALL
 MockGLInterface::Mock_glFenceSync(GLenum condition, GLbitfield flags) {
   MakeFunctionUnique("glFenceSync");
@@ skipping 142 matching lines @@
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glGenQueries(GLsizei n, GLuint* ids) {
   MakeFunctionUnique("glGenQueries");
   interface_->GenQueries(n, ids);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glGenQueriesARB(GLsizei n, GLuint* ids) {
   MakeFunctionUnique("glGenQueriesARB");
-  interface_->GenQueriesARB(n, ids);
+  interface_->GenQueries(n, ids);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glGenQueriesEXT(GLsizei n, GLuint* ids) {
   MakeFunctionUnique("glGenQueriesEXT");
-  interface_->GenQueriesARB(n, ids);
+  interface_->GenQueries(n, ids);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glGenRenderbuffers(GLsizei n, GLuint* renderbuffers) {
   MakeFunctionUnique("glGenRenderbuffers");
   interface_->GenRenderbuffersEXT(n, renderbuffers);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glGenRenderbuffersEXT(GLsizei n, GLuint* renderbuffers) {
@@ skipping 299 matching lines @@
                                                               GLint* params) {
   MakeFunctionUnique("glGetQueryObjectiv");
   interface_->GetQueryObjectiv(id, pname, params);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glGetQueryObjectivARB(GLuint id,
                                             GLenum pname,
                                             GLint* params) {
   MakeFunctionUnique("glGetQueryObjectivARB");
-  interface_->GetQueryObjectivARB(id, pname, params);
+  interface_->GetQueryObjectiv(id, pname, params);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glGetQueryObjectivEXT(GLuint id,
                                             GLenum pname,
                                             GLint* params) {
   MakeFunctionUnique("glGetQueryObjectivEXT");
-  interface_->GetQueryObjectivARB(id, pname, params);
+  interface_->GetQueryObjectiv(id, pname, params);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glGetQueryObjectui64v(GLuint id,
                                             GLenum pname,
                                             GLuint64* params) {
   MakeFunctionUnique("glGetQueryObjectui64v");
   interface_->GetQueryObjectui64v(id, pname, params);
 }
 
@@ skipping 10 matching lines @@
                                                                GLuint* params) {
   MakeFunctionUnique("glGetQueryObjectuiv");
   interface_->GetQueryObjectuiv(id, pname, params);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glGetQueryObjectuivARB(GLuint id,
                                              GLenum pname,
                                              GLuint* params) {
   MakeFunctionUnique("glGetQueryObjectuivARB");
-  interface_->GetQueryObjectuivARB(id, pname, params);
+  interface_->GetQueryObjectuiv(id, pname, params);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glGetQueryObjectuivEXT(GLuint id,
                                              GLenum pname,
                                              GLuint* params) {
   MakeFunctionUnique("glGetQueryObjectuivEXT");
-  interface_->GetQueryObjectuivARB(id, pname, params);
+  interface_->GetQueryObjectuiv(id, pname, params);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glGetQueryiv(GLenum target, GLenum pname, GLint* params) {
   MakeFunctionUnique("glGetQueryiv");
   interface_->GetQueryiv(target, pname, params);
 }
 
 void GL_BINDING_CALL MockGLInterface::Mock_glGetQueryivARB(GLenum target,
                                                            GLenum pname,
                                                            GLint* params) {
   MakeFunctionUnique("glGetQueryivARB");
-  interface_->GetQueryivARB(target, pname, params);
+  interface_->GetQueryiv(target, pname, params);
 }
 
 void GL_BINDING_CALL MockGLInterface::Mock_glGetQueryivEXT(GLenum target,
                                                            GLenum pname,
                                                            GLint* params) {
   MakeFunctionUnique("glGetQueryivEXT");
-  interface_->GetQueryivARB(target, pname, params);
+  interface_->GetQueryiv(target, pname, params);
 }
 
 void GL_BINDING_CALL
 MockGLInterface::Mock_glGetRenderbufferParameteriv(GLenum target,
                                                    GLenum pname,
                                                    GLint* params) {
   MakeFunctionUnique("glGetRenderbufferParameteriv");
   interface_->GetRenderbufferParameterivEXT(target, pname, params);
 }
 
@@ skipping 259 matching lines @@
   return interface_->IsProgram(program);
 }
 
 GLboolean GL_BINDING_CALL MockGLInterface::Mock_glIsQuery(GLuint query) {
   MakeFunctionUnique("glIsQuery");
   return interface_->IsQuery(query);
 }
 
 GLboolean GL_BINDING_CALL MockGLInterface::Mock_glIsQueryARB(GLuint query) {
   MakeFunctionUnique("glIsQueryARB");
-  return interface_->IsQueryARB(query);
+  return interface_->IsQuery(query);
 }
 
 GLboolean GL_BINDING_CALL MockGLInterface::Mock_glIsQueryEXT(GLuint query) {
   MakeFunctionUnique("glIsQueryEXT");
-  return interface_->IsQueryARB(query);
+  return interface_->IsQuery(query);
 }
 
 GLboolean GL_BINDING_CALL
 MockGLInterface::Mock_glIsRenderbuffer(GLuint renderbuffer) {
   MakeFunctionUnique("glIsRenderbuffer");
   return interface_->IsRenderbufferEXT(renderbuffer);
 }
 
 GLboolean GL_BINDING_CALL
 MockGLInterface::Mock_glIsRenderbufferEXT(GLuint renderbuffer) {
@@ skipping 1597 matching lines @@
   if (strcmp(name, "glVertexAttribPointer") == 0)
     return reinterpret_cast<void*>(Mock_glVertexAttribPointer);
   if (strcmp(name, "glViewport") == 0)
     return reinterpret_cast<void*>(Mock_glViewport);
   if (strcmp(name, "glWaitSync") == 0)
     return reinterpret_cast<void*>(Mock_glWaitSync);
   return reinterpret_cast<void*>(&MockInvalidFunction);
 }
 
 }  // namespace gfx