Make more GL stuff auto-generated

I moved gl_mock.h/cc from gpu to gl and made them mostly autogenned

BUG=none

Review URL: https://codereview.chromium.org/11444028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171744 0039d316-1c4b-4281-b951-d872f2087c98

24 files changed, 22 insertions, 576 deletions

diff --git a/gpu/command_buffer/common/debug_marker_manager_unittest.cc b/gpu/command_buffer/common/debug_marker_manager_unittest.cc
index c64297d..fa1cfcc 100644
--- a/gpu/command_buffer/common/debug_marker_manager_unittest.cc
+++ b/gpu/command_buffer/common/debug_marker_manager_unittest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/common/debug_marker_manager.h"
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_mock.h"
 
 namespace gpu {
 namespace gles2 {
diff --git a/gpu/command_buffer/common/gl_mock.cc b/gpu/command_buffer/common/gl_mock.cc
deleted file mode 100644
index 0d2b097..0000000
--- a/gpu/command_buffer/common/gl_mock.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2010 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/common/gl_mock.h"
-
-namespace gfx {
-
-MockGLInterface::MockGLInterface() {
-}
-
-MockGLInterface::~MockGLInterface() {
-}
-
-}  // namespace gfx
diff --git a/gpu/command_buffer/common/gl_mock.h b/gpu/command_buffer/common/gl_mock.h
deleted file mode 100644
index 3d2e2b5..0000000
--- a/gpu/command_buffer/common/gl_mock.h
+++ /dev/null
@@ -1,537 +0,0 @@
-// 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.
-
-// This file implements mock GL Interface for unit testing. It has to mock
-// Desktop GL, not GLES2 as it is used to test the service side code.
-
-#ifndef GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
-#define GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
-
-#include "testing/gmock/include/gmock/gmock.h"
-#include "ui/gl/gl_interface.h"
-
-namespace gfx {
-
-class MockGLInterface : public GLInterface {
- public:
-  MockGLInterface();
-  virtual ~MockGLInterface();
-
-  MOCK_METHOD1(ActiveTexture, void(GLenum texture));
-
-  MOCK_METHOD2(AttachShader, void(GLuint program, GLuint shader));
-
-  MOCK_METHOD2(BeginQuery, void(GLenum target, GLuint id));
-
-  MOCK_METHOD3(BindAttribLocation, void(
-      GLuint program, GLuint index, const char* name));
-
-  MOCK_METHOD2(BindBuffer, void(GLenum target, GLuint buffer));
-
-  MOCK_METHOD3(BindFragDataLocation, void(GLuint program, GLuint colorNumber,
-      const char* name));
-
-  MOCK_METHOD4(BindFragDataLocationIndexed, void(GLuint program,
-      GLuint colorNumber, GLuint index, const char* name));
-
-  MOCK_METHOD2(BindFramebufferEXT, void(GLenum target, GLuint framebuffer));
-
-  MOCK_METHOD2(BindRenderbufferEXT, void(GLenum target, GLuint renderbuffer));
-
-  MOCK_METHOD2(BindTexture, void(GLenum target, GLuint texture));
-
-  MOCK_METHOD4(BlendColor, void(
-      GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha));
-
-  MOCK_METHOD1(BlendEquation, void(GLenum mode));
-
-  MOCK_METHOD2(BlendEquationSeparate, void(GLenum modeRGB, GLenum modeAlpha));
-
-  MOCK_METHOD2(BlendFunc, void(GLenum sfactor, GLenum dfactor));
-
-  MOCK_METHOD4(BlendFuncSeparate, void(
-      GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha));
-
-  MOCK_METHOD10(BlitFramebufferANGLE, void(
-      GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-      GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-      GLbitfield mask, GLenum filter));
-
-  MOCK_METHOD10(BlitFramebufferEXT, void(
-      GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-      GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-      GLbitfield mask, GLenum filter));
-
-  MOCK_METHOD4(BufferData, void(
-      GLenum target, GLsizeiptr size, const void* data, GLenum usage));
-
-  MOCK_METHOD4(BufferSubData, void(
-      GLenum target, GLintptr offset, GLsizeiptr size, const void* data));
-
-  MOCK_METHOD1(CheckFramebufferStatusEXT, GLenum(GLenum target));
-
-  MOCK_METHOD1(Clear, void(GLbitfield mask));
-
-  MOCK_METHOD4(ClearColor, void(
-      GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha));
-
-  MOCK_METHOD1(ClearDepth, void(GLclampd depth));
-
-  MOCK_METHOD1(ClearDepthf, void(GLclampf depth));
-
-  MOCK_METHOD1(ClearStencil, void(GLint s));
-
-  MOCK_METHOD4(ColorMask, void(
-      GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha));
-
-  MOCK_METHOD1(CompileShader, void(GLuint shader));
-
-  MOCK_METHOD8(CompressedTexImage2D, void(
-      GLenum target, GLint level, GLenum internalformat, GLsizei width,
-      GLsizei height, GLint border, GLsizei imageSize, const void* data));
-
-  MOCK_METHOD9(CompressedTexSubImage2D, void(
-      GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
-      GLsizei height, GLenum format, GLsizei imageSize, const void* data));
-
-  MOCK_METHOD8(CopyTexImage2D, void(
-      GLenum target, GLint level, GLenum internalformat, GLint x, GLint y,
-      GLsizei width, GLsizei height, GLint border));
-
-  MOCK_METHOD8(CopyTexSubImage2D, void(
-      GLenum target, GLint level, GLint xoffset, GLint yoffset,
-      GLint x, GLint y, GLsizei width, GLsizei height));
-
-  MOCK_METHOD0(CreateProgram, GLuint());
-
-  MOCK_METHOD1(CreateShader, GLuint(GLenum type));
-
-  MOCK_METHOD1(CullFace, void(GLenum mode));
-
-  MOCK_METHOD2(DeleteBuffersARB, void(GLsizei n, const GLuint* buffers));
-
-  MOCK_METHOD2(DeleteFramebuffersEXT,
-               void(GLsizei n, const GLuint* framebuffers));
-
-  MOCK_METHOD1(DeleteProgram, void(GLuint program));
-
-  MOCK_METHOD2(DeleteQueries, void(GLsizei n, const GLuint* ids));
-
-  MOCK_METHOD2(DeleteRenderbuffersEXT, void(
-      GLsizei n, const GLuint* renderbuffers));
-
-  MOCK_METHOD1(DeleteShader, void(GLuint shader));
-
-  MOCK_METHOD2(DeleteTextures, void(GLsizei n, const GLuint* textures));
-
-  MOCK_METHOD1(DepthFunc, void(GLenum func));
-
-  MOCK_METHOD1(DepthMask, void(GLboolean flag));
-
-  MOCK_METHOD2(DepthRange, void(GLclampd zNear, GLclampd zFar));
-
-  MOCK_METHOD2(DepthRangef, void(GLclampf zNear, GLclampf zFar));
-
-  MOCK_METHOD2(DetachShader, void(GLuint program, GLuint shader));
-
-  MOCK_METHOD1(Disable, void(GLenum cap));
-
-  MOCK_METHOD1(DisableVertexAttribArray, void(GLuint index));
-
-  MOCK_METHOD3(DrawArrays, void(GLenum mode, GLint first, GLsizei count));
-
-  MOCK_METHOD1(DrawBuffer, void(GLenum mode));
-
-  MOCK_METHOD2(DrawBuffersARB, void(GLsizei n, const GLenum* bufs));
-
-  MOCK_METHOD4(DrawElements, void(
-      GLenum mode, GLsizei count, GLenum type, const void* indices));
-
-  MOCK_METHOD2(EGLImageTargetTexture2DOES, void(
-      GLenum target, GLeglImageOES image));
-
-  MOCK_METHOD2(EGLImageTargetRenderbufferStorageOES, void(
-      GLenum target, GLeglImageOES image));
-
-  MOCK_METHOD1(Enable, void(GLenum cap));
-
-  MOCK_METHOD1(EnableVertexAttribArray, void(GLuint index));
-
-  MOCK_METHOD1(EndQuery, void(GLenum target));
-
-  MOCK_METHOD0(Finish, void());
-
-  MOCK_METHOD0(Flush, void());
-
-  MOCK_METHOD4(FramebufferRenderbufferEXT, void(
-      GLenum target, GLenum attachment, GLenum renderbuffertarget,
-      GLuint renderbuffer));
-
-  MOCK_METHOD5(FramebufferTexture2DEXT, void(
-      GLenum target, GLenum attachment, GLenum textarget, GLuint texture,
-      GLint level));
-
-  MOCK_METHOD1(FrontFace, void(GLenum mode));
-
-  MOCK_METHOD2(GenBuffersARB, void(GLsizei n, GLuint* buffers));
-
-  MOCK_METHOD1(GenerateMipmapEXT, void(GLenum target));
-
-  MOCK_METHOD2(GenFramebuffersEXT, void(GLsizei n, GLuint* framebuffers));
-
-  MOCK_METHOD2(GenQueries, void(GLsizei n, GLuint* ids));
-
-  MOCK_METHOD2(GenRenderbuffersEXT, void(GLsizei n, GLuint* renderbuffers));
-
-  MOCK_METHOD2(GenTextures, void(GLsizei n, GLuint* textures));
-
-  MOCK_METHOD7(GetActiveAttrib, void(
-      GLuint program, GLuint index, GLsizei bufsize, GLsizei* length,
-      GLint* size, GLenum* type, char* name));
-
-  MOCK_METHOD7(GetActiveUniform, void(
-      GLuint program, GLuint index, GLsizei bufsize, GLsizei* length,
-      GLint* size, GLenum* type, char* name));
-
-  MOCK_METHOD4(GetAttachedShaders, void(
-      GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders));
-
-  MOCK_METHOD2(GetAttribLocation, GLint(GLuint program, const char* name));
-
-  MOCK_METHOD2(GetBooleanv, void(GLenum pname, GLboolean* params));
-
-  MOCK_METHOD3(GetBufferParameteriv, void(
-      GLenum target, GLenum pname, GLint* params));
-
-  MOCK_METHOD0(GetError, GLenum());
-
-  MOCK_METHOD2(GetFloatv, void(GLenum pname, GLfloat* params));
-
-  MOCK_METHOD4(GetFramebufferAttachmentParameterivEXT, void(
-      GLenum target, GLenum attachment, GLenum pname, GLint* params));
-
-  MOCK_METHOD2(GetIntegerv, void(GLenum pname, GLint* params));
-
-  MOCK_METHOD5(GetProgramBinary, void(
-      GLuint program, GLsizei bufSize, GLsizei* length, GLenum* binaryFormat,
-      GLvoid* binary));
-
-  MOCK_METHOD3(GetProgramiv, void(GLuint program, GLenum pname, GLint* params));
-
-  MOCK_METHOD4(GetProgramInfoLog, void(
-      GLuint program, GLsizei bufsize, GLsizei* length, char* infolog));
-
-  MOCK_METHOD3(GetQueryiv, void(GLenum target, GLenum pname, GLint* params));
-
-  MOCK_METHOD3(GetQueryObjecti64v, void(
-      GLuint id, GLenum pname, GLint64* params));
-
-  MOCK_METHOD3(GetQueryObjectiv, void(GLuint id, GLenum pname, GLint* params));
-
-  MOCK_METHOD3(GetQueryObjectui64v, void(
-      GLuint id, GLenum pname, GLuint64* params));
-
-  MOCK_METHOD3(GetQueryObjectuiv, void(
-      GLuint id, GLenum pname, GLuint* params));
-
-  MOCK_METHOD3(GetRenderbufferParameterivEXT, void(
-      GLenum target, GLenum pname, GLint* params));
-
-  MOCK_METHOD3(GetShaderiv, void(GLuint shader, GLenum pname, GLint* params));
-
-  MOCK_METHOD4(GetShaderInfoLog, void(
-      GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog));
-
-  MOCK_METHOD4(GetShaderPrecisionFormat, void(
-      GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision));
-
-  MOCK_METHOD4(GetShaderSource, void(
-      GLuint shader, GLsizei bufsize, GLsizei* length, char* source));
-
-  MOCK_METHOD1(GetString, const GLubyte*(GLenum name));
-
-  MOCK_METHOD4(GetTexLevelParameterfv, void(
-      GLenum target, GLint level, GLenum pname, GLfloat* params));
-
-  MOCK_METHOD4(GetTexLevelParameteriv, void(
-      GLenum target, GLint level, GLenum pname, GLint* params));
-
-  MOCK_METHOD3(GetTexParameterfv, void(
-      GLenum target, GLenum pname, GLfloat* params));
-
-  MOCK_METHOD3(GetTexParameteriv, void(
-      GLenum target, GLenum pname, GLint* params));
-
-  MOCK_METHOD4(GetTranslatedShaderSourceANGLE, void(
-      GLuint shader, GLsizei bufsize, GLsizei* length, char* source));
-
-  MOCK_METHOD3(GetUniformfv,
-               void(GLuint program, GLint location, GLfloat* params));
-
-  MOCK_METHOD3(GetUniformiv,
-               void(GLuint program, GLint location, GLint* params));
-
-  MOCK_METHOD2(GetUniformLocation, GLint(GLuint program, const char* name));
-
-  MOCK_METHOD3(GetVertexAttribfv, void(
-      GLuint index, GLenum pname, GLfloat* params));
-
-  MOCK_METHOD3(GetVertexAttribiv,
-               void(GLuint index, GLenum pname, GLint* params));
-
-  MOCK_METHOD3(GetVertexAttribPointerv, void(
-      GLuint index, GLenum pname, void** pointer));
-
-  MOCK_METHOD2(Hint, void(GLenum target, GLenum mode));
-
-  MOCK_METHOD1(IsBuffer, GLboolean(GLuint buffer));
-
-  MOCK_METHOD1(IsEnabled, GLboolean(GLenum cap));
-
-  MOCK_METHOD1(IsFramebufferEXT, GLboolean(GLuint framebuffer));
-
-  MOCK_METHOD1(IsProgram, GLboolean(GLuint program));
-
-  MOCK_METHOD1(IsRenderbufferEXT, GLboolean(GLuint renderbuffer));
-
-  MOCK_METHOD1(IsShader, GLboolean(GLuint shader));
-
-  MOCK_METHOD1(IsTexture, GLboolean(GLuint texture));
-
-  MOCK_METHOD1(LineWidth, void(GLfloat width));
-
-  MOCK_METHOD1(LinkProgram, void(GLuint program));
-
-  MOCK_METHOD2(MapBuffer, void*(GLenum target, GLenum access));
-
-  MOCK_METHOD2(PixelStorei, void(GLenum pname, GLint param));
-
-  MOCK_METHOD2(PointParameteri, void(GLenum pname, GLint param));
-
-  MOCK_METHOD2(PolygonOffset, void(GLfloat factor, GLfloat units));
-
-  MOCK_METHOD4(ProgramBinary, void(
-      GLuint program, GLenum binaryFormat, const GLvoid* binary,
-      GLsizei length));
-
-  MOCK_METHOD3(ProgramParameteri, void(
-      GLuint program, GLenum pname, GLint value));
-
-  MOCK_METHOD2(QueryCounter, void(GLuint id, GLenum target));
-
-  MOCK_METHOD1(ReadBuffer, void(GLenum src));
-
-  MOCK_METHOD7(ReadPixels, void(
-      GLint x, GLint y, GLsizei width, GLsizei height, GLenum format,
-      GLenum type, void* pixels));
-
-  MOCK_METHOD0(ReleaseShaderCompiler, void());
-
-  MOCK_METHOD4(RenderbufferStorageEXT, void(
-      GLenum target, GLenum internalformat, GLsizei width, GLsizei height));
-
-  MOCK_METHOD5(RenderbufferStorageMultisampleANGLE, void(
-      GLenum target, GLsizei samples, GLenum internalformat,
-      GLsizei width, GLsizei height));
-
-  MOCK_METHOD5(RenderbufferStorageMultisampleEXT, void(
-      GLenum target, GLsizei samples, GLenum internalformat,
-      GLsizei width, GLsizei height));
-
-  MOCK_METHOD2(SampleCoverage, void(GLclampf value, GLboolean invert));
-
-  MOCK_METHOD4(Scissor, void(GLint x, GLint y, GLsizei width, GLsizei height));
-
-  MOCK_METHOD5(ShaderBinary, void(
-      GLsizei n, const GLuint* shaders, GLenum binaryformat,
-      const void* binary, GLsizei length));
-
-  MOCK_METHOD4(ShaderSource, void(
-      GLuint shader, GLsizei count, const char** str, const GLint* length));
-
-  MOCK_METHOD3(StencilFunc, void(GLenum func, GLint ref, GLuint mask));
-
-  MOCK_METHOD4(StencilFuncSeparate, void(
-      GLenum face, GLenum func, GLint ref, GLuint mask));
-
-  MOCK_METHOD1(StencilMask, void(GLuint mask));
-
-  MOCK_METHOD2(StencilMaskSeparate, void(GLenum face, GLuint mask));
-
-  MOCK_METHOD3(StencilOp, void(GLenum fail, GLenum zfail, GLenum zpass));
-
-  MOCK_METHOD4(StencilOpSeparate, void(
-      GLenum face, GLenum fail, GLenum zfail, GLenum zpass));
-
-  MOCK_METHOD9(TexImage2D, void(
-      GLenum target, GLint level, GLint internalformat, GLsizei width,
-      GLsizei height, GLint border, GLenum format, GLenum type,
-      const void* pixels));
-
-  MOCK_METHOD3(TexParameterf, void(GLenum target, GLenum pname, GLfloat param));
-
-  MOCK_METHOD3(TexParameterfv, void(
-      GLenum target, GLenum pname, const GLfloat* params));
-
-  MOCK_METHOD3(TexParameteri, void(GLenum target, GLenum pname, GLint param));
-
-  MOCK_METHOD3(TexParameteriv, void(
-      GLenum target, GLenum pname, const GLint* params));
-
-  MOCK_METHOD5(TexStorage2DEXT, void(
-      GLenum target, GLsizei levels, GLenum internalformat,
-      GLsizei width, GLsizei height));
-
-  MOCK_METHOD9(TexSubImage2D, void(
-      GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
-      GLsizei height, GLenum format, GLenum type, const void* pixels));
-
-  MOCK_METHOD2(Uniform1f, void(GLint location, GLfloat x));
-
-  MOCK_METHOD3(Uniform1fv,
-               void(GLint location, GLsizei count, const GLfloat* v));
-
-  MOCK_METHOD2(Uniform1i, void(GLint location, GLint x));
-
-  MOCK_METHOD3(Uniform1iv, void(GLint location, GLsizei count, const GLint* v));
-
-  MOCK_METHOD3(Uniform2f, void(GLint location, GLfloat x, GLfloat y));
-
-  MOCK_METHOD3(Uniform2fv,
-               void(GLint location, GLsizei count, const GLfloat* v));
-
-  MOCK_METHOD3(Uniform2i, void(GLint location, GLint x, GLint y));
-
-  MOCK_METHOD3(Uniform2iv, void(GLint location, GLsizei count, const GLint* v));
-
-  MOCK_METHOD4(Uniform3f,
-               void(GLint location, GLfloat x, GLfloat y, GLfloat z));
-
-  MOCK_METHOD3(Uniform3fv,
-               void(GLint location, GLsizei count, const GLfloat* v));
-
-  MOCK_METHOD4(Uniform3i, void(GLint location, GLint x, GLint y, GLint z));
-
-  MOCK_METHOD3(Uniform3iv, void(GLint location, GLsizei count, const GLint* v));
-
-  MOCK_METHOD5(Uniform4f, void(
-      GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w));
-
-  MOCK_METHOD3(Uniform4fv,
-               void(GLint location, GLsizei count, const GLfloat* v));
-
-  MOCK_METHOD5(Uniform4i,
-               void(GLint location, GLint x, GLint y, GLint z, GLint w));
-
-  MOCK_METHOD3(Uniform4iv, void(GLint location, GLsizei count, const GLint* v));
-
-  MOCK_METHOD4(UniformMatrix2fv, void(
-      GLint location, GLsizei count, GLboolean transpose,
-      const GLfloat* value));
-
-  MOCK_METHOD4(UniformMatrix3fv, void(
-      GLint location, GLsizei count, GLboolean transpose,
-      const GLfloat* value));
-
-  MOCK_METHOD4(UniformMatrix4fv, void(
-      GLint location, GLsizei count, GLboolean transpose,
-      const GLfloat* value));
-
-  MOCK_METHOD1(UnmapBuffer, GLboolean(GLenum target));
-
-  MOCK_METHOD1(UseProgram, void(GLuint program));
-
-  MOCK_METHOD1(ValidateProgram, void(GLuint program));
-
-  MOCK_METHOD2(VertexAttrib1f, void(GLuint indx, GLfloat x));
-
-  MOCK_METHOD2(VertexAttrib1fv, void(GLuint indx, const GLfloat* values));
-
-  MOCK_METHOD3(VertexAttrib2f, void(GLuint indx, GLfloat x, GLfloat y));
-
-  MOCK_METHOD2(VertexAttrib2fv, void(GLuint indx, const GLfloat* values));
-
-  MOCK_METHOD4(VertexAttrib3f,
-              void(GLuint indx, GLfloat x, GLfloat y, GLfloat z));
-
-  MOCK_METHOD2(VertexAttrib3fv, void(GLuint indx, const GLfloat* values));
-
-  MOCK_METHOD5(VertexAttrib4f, void(
-      GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w));
-
-  MOCK_METHOD2(VertexAttrib4fv, void(GLuint indx, const GLfloat* values));
-
-  MOCK_METHOD6(VertexAttribPointer, void(
-      GLuint indx, GLint size, GLenum type, GLboolean normalized,
-      GLsizei stride, const void* ptr));
-
-  MOCK_METHOD4(Viewport, void(GLint x, GLint y, GLsizei width, GLsizei height));
-
-  MOCK_METHOD0(SwapBuffers, void());
-
-  MOCK_METHOD4(GetMaxValueInBufferCHROMIUM, GLuint(
-      GLuint buffer_id, GLsizei count, GLenum type, GLuint offset));
-
-  MOCK_METHOD2(GenFencesNV, void(GLsizei n, GLuint *fences));
-
-  MOCK_METHOD2(DeleteFencesNV, void(GLsizei n, const GLuint *fences));
-
-  MOCK_METHOD2(SetFenceNV, void(GLuint fence, GLenum condition));
-
-  MOCK_METHOD1(TestFenceNV, GLboolean(GLuint fence));
-
-  MOCK_METHOD1(FinishFenceNV, void(GLuint fence));
-
-  MOCK_METHOD1(IsFenceNV, GLboolean(GLuint fence));
-
-  MOCK_METHOD3(GetFenceivNV, void(GLuint fence, GLenum pname, GLint *params));
-
-  MOCK_METHOD2(FenceSync, GLsync(GLenum condition, GLbitfield flags));
-
-  MOCK_METHOD1(DeleteSync, void(GLsync sync));
-
-  MOCK_METHOD5(GetSynciv, void(
-      GLsync sync, GLenum pname, GLsizei bufSize,
-      GLsizei* length, GLint* values));
-
-  MOCK_METHOD2(GenQueriesARB, void(GLsizei n, GLuint* ids));
-
-  MOCK_METHOD2(DeleteQueriesARB, void(GLsizei n, const GLuint* ids));
-
-  MOCK_METHOD1(IsQueryARB, GLboolean(GLuint id));
-
-  MOCK_METHOD2(BeginQueryARB, void(GLenum target, GLuint id));
-
-  MOCK_METHOD1(EndQueryARB, void(GLenum target));
-
-  MOCK_METHOD3(GetQueryivARB, void(GLenum target, GLenum pname, GLint* params));
-
-  MOCK_METHOD3(GetQueryObjectuivARB, void(
-      GLuint id, GLenum pname, GLuint* params));
-
-  MOCK_METHOD1(SetSurfaceCHROMIUM, void(GLuint));
-
-  MOCK_METHOD0(GetGraphicsResetStatusARB, GLenum());
-
-  MOCK_METHOD4(DrawArraysInstancedANGLE, void(
-      GLenum mode, GLint first, GLsizei count, GLsizei primcount));
-
-  MOCK_METHOD5(DrawElementsInstancedANGLE, void(
-      GLenum mode, GLsizei count, GLenum type, const void* indices,
-      GLsizei primcount));
-
-  MOCK_METHOD2(VertexAttribDivisorANGLE, void(GLuint index, GLuint divisor));
-
-  MOCK_METHOD2(GenVertexArraysOES, void(GLsizei n, GLuint* ids));
-
-  MOCK_METHOD2(DeleteVertexArraysOES, void(GLsizei n, const GLuint* ids));
-
-  MOCK_METHOD1(IsVertexArrayOES, GLboolean(GLuint id));
-
-  MOCK_METHOD1(BindVertexArrayOES, void(GLuint id));
-};
-
-}  // namespace gfx
-
-#endif  // GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
diff --git a/gpu/command_buffer/service/buffer_manager_unittest.cc b/gpu/command_buffer/service/buffer_manager_unittest.cc
index 3d372af..ab8cb99 100644
--- a/gpu/command_buffer/service/buffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/buffer_manager_unittest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/buffer_manager.h"
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_mock.h"
 
 namespace gpu {
 namespace gles2 {
diff --git a/gpu/command_buffer/service/context_group_unittest.cc b/gpu/command_buffer/service/context_group_unittest.cc
index 5a15abf..8ae1db3 100644
--- a/gpu/command_buffer/service/context_group_unittest.cc
+++ b/gpu/command_buffer/service/context_group_unittest.cc
@@ -5,10 +5,10 @@
 #include "gpu/command_buffer/service/context_group.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_mock.h"
 
 using ::gfx::MockGLInterface;
 using ::testing::_;
diff --git a/gpu/command_buffer/service/feature_info_unittest.cc b/gpu/command_buffer/service/feature_info_unittest.cc
index 3ec10c0..6a469a6 100644
--- a/gpu/command_buffer/service/feature_info_unittest.cc
+++ b/gpu/command_buffer/service/feature_info_unittest.cc
@@ -5,11 +5,11 @@
 #include "gpu/command_buffer/service/feature_info.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_mock.h"
 
 using ::gfx::MockGLInterface;
 using ::testing::_;
diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
index 31261ea..a32e197 100644
--- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
@@ -5,8 +5,8 @@
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/feature_info.h"
 
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_mock.h"
 
 using ::testing::Return;
 
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
index de780a4..1c0ec4e 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
@@ -5,7 +5,6 @@
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include "base/atomicops.h"
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/common/id_allocator.h"
@@ -21,6 +20,7 @@
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_mock.h"
 #include "ui/gl/gl_surface_stub.h"
 
 
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1.cc
index 5039cd6..52aa445 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1.cc
@@ -4,7 +4,6 @@
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
@@ -12,6 +11,7 @@
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/program_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_mock.h"
 
 using ::gfx::MockGLInterface;
 using ::testing::_;
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
index 1803733..5a0633a 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
@@ -4,7 +4,6 @@
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
@@ -12,6 +11,7 @@
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/program_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_mock.h"
 
 using ::gfx::MockGLInterface;
 using ::testing::_;
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3.cc
index ec2530e..1f181d7 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3.cc
@@ -4,7 +4,6 @@
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
@@ -12,6 +11,7 @@
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/program_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_mock.h"
 
 using ::gfx::MockGLInterface;
 using ::testing::_;
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
index 826296c..4629284 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "base/string_number_conversions.h"
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
@@ -19,6 +18,7 @@
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_mock.h"
 
 using ::gfx::MockGLInterface;
 using ::testing::_;
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
index 158bf09..420351e 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
@@ -5,7 +5,6 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
 
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
@@ -23,6 +22,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_context_stub.h"
 #include "ui/gl/gl_surface_stub.h"
+#include "ui/gl/gl_mock.h"
 
 namespace gpu {
 namespace gles2 {
diff --git a/gpu/command_buffer/service/memory_program_cache_unittest.cc b/gpu/command_buffer/service/memory_program_cache_unittest.cc
index 7d3f3e6..7755fcd 100644
--- a/gpu/command_buffer/service/memory_program_cache_unittest.cc
+++ b/gpu/command_buffer/service/memory_program_cache_unittest.cc
@@ -4,12 +4,12 @@
 
 #include "gpu/command_buffer/service/memory_program_cache.h"
 
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/shader_translator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_mock.h"
 
 using ::testing::_;
 using ::testing::ElementsAreArray;
diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc
index 8499ff3..f3c163a 100644
--- a/gpu/command_buffer/service/program_manager_unittest.cc
+++ b/gpu/command_buffer/service/program_manager_unittest.cc
@@ -9,7 +9,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/common_decoder.h"
@@ -17,6 +16,7 @@
 #include "gpu/command_buffer/service/mocks.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_mock.h"
 
 using ::gfx::MockGLInterface;
 using ::testing::_;
diff --git a/gpu/command_buffer/service/query_manager_unittest.cc b/gpu/command_buffer/service/query_manager_unittest.cc
index 941b2e8..51bd462 100644
--- a/gpu/command_buffer/service/query_manager_unittest.cc
+++ b/gpu/command_buffer/service/query_manager_unittest.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/query_manager.h"
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
@@ -11,6 +10,7 @@
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_mock.h"
 
 using ::testing::_;
 using ::testing::InSequence;
diff --git a/gpu/command_buffer/service/renderbuffer_manager_unittest.cc b/gpu/command_buffer/service/renderbuffer_manager_unittest.cc
index 1ac8bcb..15218bc 100644
--- a/gpu/command_buffer/service/renderbuffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/renderbuffer_manager_unittest.cc
@@ -5,8 +5,8 @@
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
 
 #include <set>
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_mock.h"
 
 namespace gpu {
 namespace gles2 {
diff --git a/gpu/command_buffer/service/shader_manager_unittest.cc b/gpu/command_buffer/service/shader_manager_unittest.cc
index f03a034..5a3610d 100644
--- a/gpu/command_buffer/service/shader_manager_unittest.cc
+++ b/gpu/command_buffer/service/shader_manager_unittest.cc
@@ -5,9 +5,9 @@
 #include "gpu/command_buffer/service/shader_manager.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/service/mocks.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_mock.h"
 
 using ::testing::Return;
 using ::testing::ReturnRef;
diff --git a/gpu/command_buffer/service/test_helper.cc b/gpu/command_buffer/service/test_helper.cc
index 86eab65..fadd17b 100644
--- a/gpu/command_buffer/service/test_helper.cc
+++ b/gpu/command_buffer/service/test_helper.cc
@@ -9,11 +9,11 @@
 
 #include "base/string_number_conversions.h"
 #include "base/string_tokenizer.h"
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/common/types.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/program_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_mock.h"
 
 using ::testing::_;
 using ::testing::DoAll;
diff --git a/gpu/command_buffer/service/test_helper.h b/gpu/command_buffer/service/test_helper.h
index 9fc4550..86354c6 100644
--- a/gpu/command_buffer/service/test_helper.h
+++ b/gpu/command_buffer/service/test_helper.h
@@ -5,7 +5,7 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_TEST_HELPER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_TEST_HELPER_H_
 
-#include "gpu/command_buffer/common/gl_mock.h"
+#include "ui/gl/gl_mock.h"
 
 namespace gpu {
 namespace gles2 {
diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc
index a761c03..698cabf 100644
--- a/gpu/command_buffer/service/texture_manager_unittest.cc
+++ b/gpu/command_buffer/service/texture_manager_unittest.cc
@@ -5,11 +5,11 @@
 #include "gpu/command_buffer/service/texture_manager.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_mock.h"
 
 using ::testing::Pointee;
 using ::testing::Return;
diff --git a/gpu/command_buffer/service/vertex_array_manager_unittest.cc b/gpu/command_buffer/service/vertex_array_manager_unittest.cc
index e411489..48712ac 100644
--- a/gpu/command_buffer/service/vertex_array_manager_unittest.cc
+++ b/gpu/command_buffer/service/vertex_array_manager_unittest.cc
@@ -6,10 +6,10 @@
 #include "gpu/command_buffer/service/vertex_attrib_manager.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_mock.h"
 
 using ::testing::Pointee;
 using ::testing::_;
diff --git a/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc b/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
index d23032e..07b1521 100644
--- a/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
+++ b/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
@@ -5,10 +5,10 @@
 #include "gpu/command_buffer/service/vertex_attrib_manager.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_mock.h"
 
 using ::testing::Pointee;
 using ::testing::_;
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index d63b139..2ad0bcb 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -257,14 +257,12 @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/khronos/khronos.gyp:khronos_headers',
-        '../ui/gl/gl.gyp:gl',
+        '../ui/gl/gl.gyp:gl_unittest_utils',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
-        'command_buffer/common/gl_mock.h',
-        'command_buffer/common/gl_mock.cc',
         'command_buffer/service/gles2_cmd_decoder_mock.cc',
         'command_buffer/service/gles2_cmd_decoder_mock.cc',
       ],