Revert of Make GL bindings conditional

ui/gl/gl_bindings_autogen_mock.cc

Index: ui/gl/gl_bindings_autogen_mock.cc
diff --git a/ui/gl/gl_bindings_autogen_mock.cc b/ui/gl/gl_bindings_autogen_mock.cc
index 185d80964b5a9fc89c32ffe5c4983198831e69d8..f42469685c8640a6a03b8a05b86741fd47a5dd85 100644
--- a/ui/gl/gl_bindings_autogen_mock.cc
+++ b/ui/gl/gl_bindings_autogen_mock.cc
@@ -479,6 +479,12 @@
 }
 
 void GL_BINDING_CALL
+MockGLInterface::Mock_glDeleteBuffersARB(GLsizei n, const GLuint* buffers) {
+  MakeFunctionUnique("glDeleteBuffersARB");
+  interface_->DeleteBuffersARB(n, buffers);
+}
+
+void GL_BINDING_CALL
 MockGLInterface::Mock_glDeleteFencesAPPLE(GLsizei n, const GLuint* fences) {
   MakeFunctionUnique("glDeleteFencesAPPLE");
   interface_->DeleteFencesAPPLE(n, fences);
@@ -905,6 +911,12 @@
 void GL_BINDING_CALL
 MockGLInterface::Mock_glGenBuffers(GLsizei n, GLuint* buffers) {
   MakeFunctionUnique("glGenBuffers");
+  interface_->GenBuffersARB(n, buffers);
+}
+
+void GL_BINDING_CALL
+MockGLInterface::Mock_glGenBuffersARB(GLsizei n, GLuint* buffers) {
+  MakeFunctionUnique("glGenBuffersARB");
   interface_->GenBuffersARB(n, buffers);
 }
 
@@ -1235,14 +1247,6 @@
                                            GLenum pname,
                                            GLint64* params) {
   MakeFunctionUnique("glGetQueryObjecti64v");
-  interface_->GetQueryObjecti64v(id, pname, params);
-}
-
-void GL_BINDING_CALL
-MockGLInterface::Mock_glGetQueryObjecti64vEXT(GLuint id,
-                                              GLenum pname,
-                                              GLint64* params) {
-  MakeFunctionUnique("glGetQueryObjecti64vEXT");
   interface_->GetQueryObjecti64v(id, pname, params);
 }
 
@@ -2646,6 +2650,8 @@
     return reinterpret_cast<void*>(Mock_glCullFace);
   if (strcmp(name, "glDeleteBuffers") == 0)
     return reinterpret_cast<void*>(Mock_glDeleteBuffers);
+  if (strcmp(name, "glDeleteBuffersARB") == 0)
+    return reinterpret_cast<void*>(Mock_glDeleteBuffersARB);
   if (strcmp(name, "glDeleteFencesAPPLE") == 0)
     return reinterpret_cast<void*>(Mock_glDeleteFencesAPPLE);
   if (strcmp(name, "glDeleteFencesNV") == 0)
@@ -2770,6 +2776,8 @@
     return reinterpret_cast<void*>(Mock_glFrontFace);
   if (strcmp(name, "glGenBuffers") == 0)
     return reinterpret_cast<void*>(Mock_glGenBuffers);
+  if (strcmp(name, "glGenBuffersARB") == 0)
+    return reinterpret_cast<void*>(Mock_glGenBuffersARB);
   if (strcmp(name, "glGenFencesAPPLE") == 0)
     return reinterpret_cast<void*>(Mock_glGenFencesAPPLE);
   if (strcmp(name, "glGenFencesNV") == 0)
@@ -2863,8 +2871,6 @@
     return reinterpret_cast<void*>(Mock_glGetProgramiv);
   if (strcmp(name, "glGetQueryObjecti64v") == 0)
     return reinterpret_cast<void*>(Mock_glGetQueryObjecti64v);
-  if (strcmp(name, "glGetQueryObjecti64vEXT") == 0)
-    return reinterpret_cast<void*>(Mock_glGetQueryObjecti64vEXT);
   if (strcmp(name, "glGetQueryObjectiv") == 0)
     return reinterpret_cast<void*>(Mock_glGetQueryObjectiv);
   if (strcmp(name, "glGetQueryObjectivARB") == 0)