Remove unnecessary cc::FakeWebGraphicsContext3D interface

TestGLES2Interface forwards to TestWebGraphicsContext3D, so this base class
is never actually used in tests. This copies the stubs we use to TWGC3D and
deletes the rest of the class.  The next step is to start folding TWGC3D in
to TestGLES2Interface.

5 files changed, 280 insertions(+), 972 deletions(-)

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

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

5 files changed, 231 insertions, 1010 deletions

diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index c79827d..05d8b79 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -161,8 +161,6 @@
       'test/fake_ui_resource_layer_tree_host_impl.h',
       'test/fake_video_frame_provider.cc',
       'test/fake_video_frame_provider.h',
-      'test/fake_web_graphics_context_3d.cc',
-      'test/fake_web_graphics_context_3d.h',
       'test/geometry_test_utils.cc',
       'test/geometry_test_utils.h',
       'test/test_in_process_context_provider.cc',
diff --git a/cc/test/fake_web_graphics_context_3d.cc b/cc/test/fake_web_graphics_context_3d.cc
deleted file mode 100644
index efd0209..0000000
--- a/cc/test/fake_web_graphics_context_3d.cc
+++ /dev/null
@@ -1,314 +0,0 @@
-// Copyright 2013 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 "cc/test/fake_web_graphics_context_3d.h"
-
-#include "base/logging.h"
-#include "third_party/khronos/GLES2/gl2.h"
-
-namespace cc {
-
-FakeWebGraphicsContext3D::FakeWebGraphicsContext3D() {}
-
-FakeWebGraphicsContext3D::~FakeWebGraphicsContext3D() {}
-
-bool FakeWebGraphicsContext3D::makeContextCurrent() {
-  return true;
-}
-
-bool FakeWebGraphicsContext3D::isGLES2Compliant() {
-  return false;
-}
-
-GLuint FakeWebGraphicsContext3D::getPlatformTextureId() {
-  return 0;
-}
-
-bool FakeWebGraphicsContext3D::isContextLost() {
-  return false;
-}
-
-void* FakeWebGraphicsContext3D::mapBufferSubDataCHROMIUM(
-    GLenum target,
-    GLintptr offset,
-    GLsizeiptr size,
-    GLenum access) {
-  return 0;
-}
-
-void* FakeWebGraphicsContext3D::mapTexSubImage2DCHROMIUM(
-    GLenum target,
-    GLint level,
-    GLint xoffset,
-    GLint yoffset,
-    GLsizei width,
-    GLsizei height,
-    GLenum format,
-    GLenum type,
-    GLenum access) {
-  return 0;
-}
-
-GLenum FakeWebGraphicsContext3D::checkFramebufferStatus(
-    GLenum target) {
-  return GL_FRAMEBUFFER_COMPLETE;
-}
-
-GLint FakeWebGraphicsContext3D::getAttribLocation(
-    GLuint program,
-    const GLchar* name) {
-  return 0;
-}
-
-GLenum FakeWebGraphicsContext3D::getError() {
-  return GL_NO_ERROR;
-}
-
-void FakeWebGraphicsContext3D::getIntegerv(
-    GLenum pname,
-    GLint* value) {
-  if (pname == GL_MAX_TEXTURE_SIZE)
-    *value = 1024;
-  else if (pname == GL_ACTIVE_TEXTURE)
-    *value = GL_TEXTURE0;
-}
-
-void FakeWebGraphicsContext3D::getProgramiv(
-    GLuint program,
-    GLenum pname,
-    GLint* value) {
-  if (pname == GL_LINK_STATUS)
-    *value = 1;
-}
-
-void FakeWebGraphicsContext3D::getShaderiv(
-    GLuint shader,
-    GLenum pname,
-    GLint* value) {
-  if (pname == GL_COMPILE_STATUS)
-    *value = 1;
-}
-
-void FakeWebGraphicsContext3D::getShaderPrecisionFormat(
-    GLenum shadertype,
-    GLenum precisiontype,
-    GLint* range,
-    GLint* precision) {
-  // Return the minimum precision requirements of the GLES specificatin.
-  switch (precisiontype) {
-    case GL_LOW_INT:
-      range[0] = 8;
-      range[1] = 8;
-      *precision = 0;
-      break;
-    case GL_MEDIUM_INT:
-      range[0] = 10;
-      range[1] = 10;
-      *precision = 0;
-      break;
-    case GL_HIGH_INT:
-      range[0] = 16;
-      range[1] = 16;
-      *precision = 0;
-      break;
-    case GL_LOW_FLOAT:
-      range[0] = 8;
-      range[1] = 8;
-      *precision = 8;
-      break;
-    case GL_MEDIUM_FLOAT:
-      range[0] = 14;
-      range[1] = 14;
-      *precision = 10;
-      break;
-    case GL_HIGH_FLOAT:
-      range[0] = 62;
-      range[1] = 62;
-      *precision = 16;
-      break;
-    default:
-      NOTREACHED();
-      break;
-  }
-}
-
-GLint FakeWebGraphicsContext3D::getUniformLocation(
-    GLuint program,
-    const GLchar* name) {
-  return 0;
-}
-
-GLsizeiptr FakeWebGraphicsContext3D::getVertexAttribOffset(
-    GLuint index,
-    GLenum pname) {
-  return 0;
-}
-
-GLboolean FakeWebGraphicsContext3D::isBuffer(
-    GLuint buffer) {
-  return false;
-}
-
-GLboolean FakeWebGraphicsContext3D::isEnabled(
-    GLenum cap) {
-  return false;
-}
-
-GLboolean FakeWebGraphicsContext3D::isFramebuffer(
-    GLuint framebuffer) {
-  return false;
-}
-
-GLboolean FakeWebGraphicsContext3D::isProgram(
-    GLuint program) {
-  return false;
-}
-
-GLboolean FakeWebGraphicsContext3D::isRenderbuffer(
-    GLuint renderbuffer) {
-  return false;
-}
-
-GLboolean FakeWebGraphicsContext3D::isShader(
-    GLuint shader) {
-  return false;
-}
-
-GLboolean FakeWebGraphicsContext3D::isTexture(
-    GLuint texture) {
-  return false;
-}
-
-void FakeWebGraphicsContext3D::genBuffers(GLsizei count, GLuint* ids) {
-  for (int i = 0; i < count; ++i)
-    ids[i] = 1;
-}
-
-void FakeWebGraphicsContext3D::genFramebuffers(
-    GLsizei count, GLuint* ids) {
-  for (int i = 0; i < count; ++i)
-    ids[i] = 1;
-}
-
-void FakeWebGraphicsContext3D::genRenderbuffers(
-    GLsizei count, GLuint* ids) {
-  for (int i = 0; i < count; ++i)
-    ids[i] = 1;
-}
-
-void FakeWebGraphicsContext3D::genTextures(GLsizei count, GLuint* ids) {
-  for (int i = 0; i < count; ++i)
-    ids[i] = 1;
-}
-
-void FakeWebGraphicsContext3D::deleteBuffers(GLsizei count, GLuint* ids) {
-}
-
-void FakeWebGraphicsContext3D::deleteFramebuffers(
-    GLsizei count, GLuint* ids) {
-}
-
-void FakeWebGraphicsContext3D::deleteRenderbuffers(
-    GLsizei count, GLuint* ids) {
-}
-
-void FakeWebGraphicsContext3D::deleteTextures(GLsizei count, GLuint* ids) {
-}
-
-GLuint FakeWebGraphicsContext3D::createBuffer() {
-  return 1;
-}
-
-GLuint FakeWebGraphicsContext3D::createFramebuffer() {
-  return 1;
-}
-
-GLuint FakeWebGraphicsContext3D::createRenderbuffer() {
-  return 1;
-}
-
-GLuint FakeWebGraphicsContext3D::createTexture() {
-  return 1;
-}
-
-void FakeWebGraphicsContext3D::deleteBuffer(GLuint id) {
-}
-
-void FakeWebGraphicsContext3D::deleteFramebuffer(GLuint id) {
-}
-
-void FakeWebGraphicsContext3D::deleteRenderbuffer(GLuint id) {
-}
-
-void FakeWebGraphicsContext3D::deleteTexture(GLuint texture_id) {
-}
-
-GLuint FakeWebGraphicsContext3D::createProgram() {
-  return 1;
-}
-
-GLuint FakeWebGraphicsContext3D::createShader(GLenum) {
-  return 1;
-}
-
-void FakeWebGraphicsContext3D::deleteProgram(GLuint id) {
-}
-
-void FakeWebGraphicsContext3D::deleteShader(GLuint id) {
-}
-
-void FakeWebGraphicsContext3D::attachShader(GLuint program, GLuint shader) {
-}
-
-void FakeWebGraphicsContext3D::useProgram(GLuint program) {
-}
-
-void FakeWebGraphicsContext3D::bindBuffer(GLenum target, GLuint buffer) {
-}
-
-void FakeWebGraphicsContext3D::bindFramebuffer(
-    GLenum target, GLuint framebuffer) {
-}
-
-void FakeWebGraphicsContext3D::bindRenderbuffer(
-      GLenum target, GLuint renderbuffer) {
-}
-
-void FakeWebGraphicsContext3D::bindTexture(
-    GLenum target, GLuint texture_id) {
-}
-
-GLuint FakeWebGraphicsContext3D::createQueryEXT() {
-  return 1;
-}
-
-GLboolean FakeWebGraphicsContext3D::isQueryEXT(GLuint query) {
-  return true;
-}
-
-void FakeWebGraphicsContext3D::endQueryEXT(GLenum target) {
-}
-
-void FakeWebGraphicsContext3D::getQueryObjectuivEXT(
-    GLuint query,
-    GLenum pname,
-    GLuint* params) {
-}
-
-void FakeWebGraphicsContext3D::loseContextCHROMIUM(GLenum current,
-                                                   GLenum other) {
-}
-
-GLuint FakeWebGraphicsContext3D::createImageCHROMIUM(
-     GLsizei width, GLsizei height,
-     GLenum internalformat) {
-  return 0;
-}
-
-void* FakeWebGraphicsContext3D::mapImageCHROMIUM(GLuint image_id,
-                                                 GLenum access) {
-  return 0;
-}
-
-}  // namespace cc
diff --git a/cc/test/fake_web_graphics_context_3d.h b/cc/test/fake_web_graphics_context_3d.h
deleted file mode 100644
index 3f60610..0000000
--- a/cc/test/fake_web_graphics_context_3d.h
+++ /dev/null
@@ -1,599 +0,0 @@
-// Copyright 2013 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.
-
-#ifndef CC_TEST_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
-#define CC_TEST_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
-
-#include <string>
-
-#include "base/macros.h"
-#include "third_party/khronos/GLES2/gl2.h"
-
-namespace cc {
-
-// Base class for use in unit tests.
-// All operations are no-ops (returning 0 if necessary).
-class FakeWebGraphicsContext3D {
- public:
-  FakeWebGraphicsContext3D();
-  virtual ~FakeWebGraphicsContext3D();
-
-  virtual bool makeContextCurrent();
-
-  virtual bool isGLES2Compliant();
-
-  virtual GLuint getPlatformTextureId();
-
-  virtual void prepareTexture() {}
-
-  virtual void postSubBufferCHROMIUM(int x, int y, int width, int height) {}
-
-  virtual void synthesizeGLError(GLenum) {}
-
-  virtual bool isContextLost();
-
-  virtual void* mapBufferSubDataCHROMIUM(
-      GLenum target,
-      GLintptr offset,
-      GLsizeiptr size,
-      GLenum access);
-
-  virtual void unmapBufferSubDataCHROMIUM(const void*) {}
-  virtual void* mapTexSubImage2DCHROMIUM(
-      GLenum target,
-      GLint level,
-      GLint xoffset,
-      GLint yoffset,
-      GLsizei width,
-      GLsizei height,
-      GLenum format,
-      GLenum type,
-      GLenum access);
-  virtual void unmapTexSubImage2DCHROMIUM(const void*) {}
-
-  virtual void setVisibilityCHROMIUM(bool visible) {}
-
-  virtual void discardFramebufferEXT(
-      GLenum target,
-      GLsizei num_attachments,
-      const GLenum* attachments) {}
-
-  virtual void requestExtensionCHROMIUM(const char*) {}
-
-  virtual void blitFramebufferCHROMIUM(
-      GLint src_x0,
-      GLint src_y0,
-      GLint src_x1,
-      GLint src_y1,
-      GLint dst_x0,
-      GLint dst_y0,
-      GLint dst_x1,
-      GLint dst_y1,
-      GLbitfield mask,
-      GLenum filter) {}
-  virtual void renderbufferStorageMultisampleCHROMIUM(
-      GLenum target,
-      GLsizei samples,
-      GLenum internalformat,
-      GLsizei width,
-      GLsizei height) {}
-
-  virtual void activeTexture(GLenum texture) {}
-  virtual void attachShader(GLuint program, GLuint shader);
-  virtual void bindAttribLocation(
-      GLuint program,
-      GLuint index,
-      const GLchar* name) {}
-  virtual void bindBuffer(GLenum target, GLuint buffer);
-  virtual void bindFramebuffer(
-      GLenum target, GLuint framebuffer);
-  virtual void bindRenderbuffer(
-      GLenum target, GLuint renderbuffer);
-  virtual void bindTexture(
-      GLenum target,
-      GLuint texture_id);
-  virtual void blendColor(
-      GLclampf red,
-      GLclampf green,
-      GLclampf blue,
-      GLclampf alpha) {}
-  virtual void blendEquation(GLenum mode) {}
-  virtual void blendEquationSeparate(
-      GLenum mode_rgb,
-      GLenum mode_alpha) {}
-  virtual void blendFunc(
-      GLenum sfactor,
-      GLenum dfactor) {}
-  virtual void blendFuncSeparate(
-      GLenum src_rgb,
-      GLenum dst_rgb,
-      GLenum src_alpha,
-      GLenum dst_alpha) {}
-
-  virtual void bufferData(
-      GLenum target,
-      GLsizeiptr size,
-      const void* data,
-      GLenum usage) {}
-  virtual void bufferSubData(
-      GLenum target,
-      GLintptr offset,
-      GLsizeiptr size,
-      const void* data) {}
-
-  virtual GLenum checkFramebufferStatus(GLenum target);
-
-  virtual void clear(GLbitfield mask) {}
-  virtual void clearColor(
-      GLclampf red,
-      GLclampf green,
-      GLclampf blue,
-      GLclampf alpha) {}
-  virtual void clearDepth(GLclampf depth) {}
-  virtual void clearStencil(GLint s) {}
-  virtual void colorMask(
-      GLboolean red,
-      GLboolean green,
-      GLboolean blue,
-      GLboolean alpha) {}
-  virtual void compileShader(GLuint shader) {}
-
-  virtual void compressedTexImage2D(
-      GLenum target,
-      GLint level,
-      GLenum internal_format,
-      GLsizei width,
-      GLsizei height,
-      GLint border,
-      GLsizei image_size,
-      const void* data) {}
-  virtual void compressedTexSubImage2D(
-      GLenum target,
-      GLint level,
-      GLint xoffset,
-      GLint yoffset,
-      GLsizei width,
-      GLsizei height,
-      GLenum format,
-      GLsizei image_size,
-      const void* data) {}
-  virtual void copyTexImage2D(
-      GLenum target,
-      GLint level,
-      GLenum internalformat,
-      GLint x,
-      GLint y,
-      GLsizei width,
-      GLsizei height,
-      GLint border) {}
-  virtual void copyTexSubImage2D(
-      GLenum target,
-      GLint level,
-      GLint xoffset,
-      GLint yoffset,
-      GLint x,
-      GLint y,
-      GLsizei width,
-      GLsizei height) {}
-  virtual void cullFace(GLenum mode) {}
-  virtual void depthFunc(GLenum func) {}
-  virtual void depthMask(GLboolean flag) {}
-  virtual void depthRange(
-      GLclampf z_near,
-      GLclampf z_far) {}
-  virtual void detachShader(GLuint program, GLuint shader) {}
-  virtual void disable(GLenum cap) {}
-  virtual void disableVertexAttribArray(GLuint index) {}
-  virtual void drawArrays(
-      GLenum mode,
-      GLint first,
-      GLsizei count) {}
-  virtual void drawElements(
-      GLenum mode,
-      GLsizei count,
-      GLenum type,
-      GLintptr offset) {}
-
-  virtual void enable(GLenum cap) {}
-  virtual void enableVertexAttribArray(GLuint index) {}
-  virtual void finish() {}
-  virtual void flush() {}
-  virtual void shallowFlushCHROMIUM() {}
-  virtual void framebufferRenderbuffer(
-      GLenum target,
-      GLenum attachment,
-      GLenum renderbuffertarget,
-      GLuint renderbuffer) {}
-  virtual void framebufferTexture2D(
-      GLenum target,
-      GLenum attachment,
-      GLenum textarget,
-      GLuint texture,
-      GLint level) {}
-  virtual void frontFace(GLenum mode) {}
-  virtual void generateMipmap(GLenum target) {}
-
-  virtual void getAttachedShaders(
-      GLuint program,
-      GLsizei max_count,
-      GLsizei* count,
-      GLuint* shaders) {}
-  virtual GLint getAttribLocation(
-      GLuint program,
-      const GLchar* name);
-  virtual void getBooleanv(
-      GLenum pname,
-      GLboolean* value) {}
-  virtual void getBufferParameteriv(
-      GLenum target,
-      GLenum pname,
-      GLint* value) {}
-  virtual GLenum getError();
-  virtual void getFloatv(
-      GLenum pname,
-      GLfloat* value) {}
-  virtual void getFramebufferAttachmentParameteriv(
-      GLenum target,
-      GLenum attachment,
-      GLenum pname,
-      GLint* value) {}
-
-  virtual void getIntegerv(
-      GLenum pname,
-      GLint* value);
-
-  virtual void getProgramiv(
-      GLuint program,
-      GLenum pname,
-      GLint* value);
-
-  virtual void getRenderbufferParameteriv(
-      GLenum target,
-      GLenum pname,
-      GLint* value) {}
-
-  virtual void getShaderiv(
-      GLuint shader,
-      GLenum pname,
-      GLint* value);
-
-  virtual void getShaderPrecisionFormat(
-      GLenum shadertype,
-      GLenum precisiontype,
-      GLint* range,
-      GLint* precision);
-  virtual void getTexParameterfv(
-      GLenum target,
-      GLenum pname,
-      GLfloat* value) {}
-  virtual void getTexParameteriv(
-      GLenum target,
-      GLenum pname,
-      GLint* value) {}
-  virtual void getUniformfv(
-      GLuint program,
-      GLint location,
-      GLfloat* value) {}
-  virtual void getUniformiv(
-      GLuint program,
-      GLint location,
-      GLint* value) {}
-  virtual GLint getUniformLocation(
-      GLuint program,
-      const GLchar* name);
-  virtual void getVertexAttribfv(
-      GLuint index,
-      GLenum pname,
-      GLfloat* value) {}
-  virtual void getVertexAttribiv(
-      GLuint index,
-      GLenum pname,
-      GLint* value) {}
-  virtual GLsizeiptr getVertexAttribOffset(
-      GLuint index,
-      GLenum pname);
-
-  virtual void hint(GLenum target, GLenum mode) {}
-  virtual GLboolean isBuffer(GLuint buffer);
-  virtual GLboolean isEnabled(GLenum cap);
-  virtual GLboolean isFramebuffer(GLuint framebuffer);
-  virtual GLboolean isProgram(GLuint program);
-  virtual GLboolean isRenderbuffer(GLuint renderbuffer);
-  virtual GLboolean isShader(GLuint shader);
-  virtual GLboolean isTexture(GLuint texture);
-  virtual void lineWidth(GLfloat) {}
-  virtual void linkProgram(GLuint program) {}
-  virtual void pixelStorei(GLenum pname, GLint param) {}
-  virtual void polygonOffset(
-      GLfloat factor,
-      GLfloat units) {}
-
-  virtual void readPixels(
-      GLint x,
-      GLint y,
-      GLsizei width,
-      GLsizei height,
-      GLenum format,
-      GLenum type,
-      void* pixels) {}
-
-  virtual void releaseShaderCompiler() {}
-
-  virtual void renderbufferStorage(
-      GLenum target,
-      GLenum internalformat,
-      GLsizei width,
-      GLsizei height) {}
-  virtual void sampleCoverage(
-      GLclampf value,
-      GLboolean invert) {}
-  virtual void scissor(
-      GLint x,
-      GLint y,
-      GLsizei width,
-      GLsizei height) {}
-  virtual void shaderSource(
-      GLuint shader,
-      const GLchar* string) {}
-  virtual void stencilFunc(
-      GLenum func,
-      GLint ref,
-      GLuint mask) {}
-  virtual void stencilFuncSeparate(
-      GLenum face,
-      GLenum func,
-      GLint ref,
-      GLuint mask) {}
-  virtual void stencilMask(GLuint mask) {}
-  virtual void stencilMaskSeparate(
-      GLenum face,
-      GLuint mask) {}
-  virtual void stencilOp(
-      GLenum fail,
-      GLenum zfail,
-      GLenum zpass) {}
-  virtual void stencilOpSeparate(
-      GLenum face,
-      GLenum fail,
-      GLenum zfail,
-      GLenum zpass) {}
-
-  virtual void texImage2D(
-      GLenum target,
-      GLint level,
-      GLenum internalformat,
-      GLsizei width,
-      GLsizei height,
-      GLint border,
-      GLenum format,
-      GLenum type,
-      const void* pixels) {}
-
-  virtual void texParameterf(
-      GLenum target,
-      GLenum pname,
-      GLfloat param) {}
-  virtual void texParameteri(
-      GLenum target,
-      GLenum pname,
-      GLint param) {}
-
-  virtual void texSubImage2D(
-      GLenum target,
-      GLint level,
-      GLint xoffset,
-      GLint yoffset,
-      GLsizei width,
-      GLsizei height,
-      GLenum format,
-      GLenum type,
-      const void* pixels) {}
-
-  virtual void uniform1f(GLint location, GLfloat x) {}
-  virtual void uniform1fv(
-      GLint location,
-      GLsizei count,
-      const GLfloat* v) {}
-  virtual void uniform1i(GLint location, GLint x) {}
-  virtual void uniform1iv(
-      GLint location,
-      GLsizei count,
-      const GLint* v) {}
-  virtual void uniform2f(
-      GLint location,
-      GLfloat x,
-      GLfloat y) {}
-  virtual void uniform2fv(
-      GLint location,
-      GLsizei count,
-      const GLfloat* v) {}
-  virtual void uniform2i(
-      GLint location,
-      GLint x,
-      GLint y) {}
-  virtual void uniform2iv(
-      GLint location,
-      GLsizei count,
-      const GLint* v) {}
-  virtual void uniform3f(
-      GLint location,
-      GLfloat x,
-      GLfloat y,
-      GLfloat z) {}
-  virtual void uniform3fv(
-      GLint location,
-      GLsizei count,
-      const GLfloat* v) {}
-  virtual void uniform3i(
-      GLint location,
-      GLint x,
-      GLint y,
-      GLint z) {}
-  virtual void uniform3iv(
-      GLint location,
-      GLsizei count,
-      const GLint* v) {}
-  virtual void uniform4f(
-      GLint location,
-      GLfloat x,
-      GLfloat y,
-      GLfloat z,
-      GLfloat w) {}
-  virtual void uniform4fv(
-      GLint location,
-      GLsizei count,
-      const GLfloat* v) {}
-  virtual void uniform4i(
-      GLint location,
-      GLint x,
-      GLint y,
-      GLint z,
-      GLint w) {}
-  virtual void uniform4iv(
-      GLint location,
-      GLsizei count,
-      const GLint* v) {}
-  virtual void uniformMatrix2fv(
-      GLint location,
-      GLsizei count,
-      GLboolean transpose,
-      const GLfloat* value) {}
-  virtual void uniformMatrix3fv(
-      GLint location,
-      GLsizei count,
-      GLboolean transpose,
-      const GLfloat* value) {}
-  virtual void uniformMatrix4fv(
-      GLint location,
-      GLsizei count,
-      GLboolean transpose,
-      const GLfloat* value) {}
-
-  virtual void useProgram(GLuint program);
-  virtual void validateProgram(GLuint program) {}
-
-  virtual void vertexAttrib1f(GLuint index, GLfloat x) {}
-  virtual void vertexAttrib1fv(
-      GLuint index,
-      const GLfloat* values) {}
-  virtual void vertexAttrib2f(
-      GLuint index,
-      GLfloat x,
-      GLfloat y) {}
-  virtual void vertexAttrib2fv(
-      GLuint index,
-      const GLfloat* values) {}
-  virtual void vertexAttrib3f(
-      GLuint index,
-      GLfloat x,
-      GLfloat y,
-      GLfloat z) {}
-  virtual void vertexAttrib3fv(
-      GLuint index,
-      const GLfloat* values) {}
-  virtual void vertexAttrib4f(
-      GLuint index,
-      GLfloat x,
-      GLfloat y,
-      GLfloat z,
-      GLfloat w) {}
-  virtual void vertexAttrib4fv(
-      GLuint index,
-      const GLfloat* values) {}
-  virtual void vertexAttribPointer(
-      GLuint index,
-      GLint size,
-      GLenum type,
-      GLboolean normalized,
-      GLsizei stride,
-      GLintptr offset) {}
-
-  virtual void viewport(
-      GLint x,
-      GLint y,
-      GLsizei width,
-      GLsizei height) {}
-
-  virtual void genBuffers(GLsizei count, GLuint* ids);
-  virtual void genFramebuffers(GLsizei count, GLuint* ids);
-  virtual void genRenderbuffers(GLsizei count, GLuint* ids);
-  virtual void genTextures(GLsizei count, GLuint* ids);
-
-  virtual void deleteBuffers(GLsizei count, GLuint* ids);
-  virtual void deleteFramebuffers(
-      GLsizei count, GLuint* ids);
-  virtual void deleteRenderbuffers(
-      GLsizei count, GLuint* ids);
-  virtual void deleteTextures(GLsizei count, GLuint* ids);
-
-  virtual GLuint createBuffer();
-  virtual GLuint createFramebuffer();
-  virtual GLuint createRenderbuffer();
-  virtual GLuint createTexture();
-
-  virtual void deleteBuffer(GLuint id);
-  virtual void deleteFramebuffer(GLuint id);
-  virtual void deleteRenderbuffer(GLuint id);
-  virtual void deleteTexture(GLuint id);
-
-  virtual GLuint createProgram();
-  virtual GLuint createShader(GLenum);
-
-  virtual void deleteProgram(GLuint id);
-  virtual void deleteShader(GLuint id);
-
-  virtual void texStorage2DEXT(
-      GLenum target,
-      GLint levels,
-      GLuint internalformat,
-      GLint width,
-      GLint height) {}
-
-  virtual GLuint createQueryEXT();
-  virtual void deleteQueryEXT(GLuint query) {}
-  virtual GLboolean isQueryEXT(GLuint query);
-  virtual void beginQueryEXT(
-      GLenum target,
-      GLuint query) {}
-  virtual void endQueryEXT(GLenum target);
-  virtual void getQueryivEXT(
-      GLenum target,
-      GLenum pname,
-      GLint* params) {}
-  virtual void getQueryObjectuivEXT(
-      GLuint query,
-      GLenum pname,
-      GLuint* params);
-
-  virtual void loseContextCHROMIUM(GLenum current,
-                                   GLenum other);
-
-  virtual void drawBuffersEXT(GLsizei m,
-                              const GLenum* bufs) {}
-
-  virtual void bindTexImage2DCHROMIUM(GLenum target,
-                                      GLint image_id) {}
-
-  // GL_CHROMIUM_gpu_memory_buffer
-  virtual GLuint createImageCHROMIUM(
-      GLsizei width,
-      GLsizei height,
-      GLenum internalformat);
-  virtual void destroyImageCHROMIUM(GLuint image_id) {}
-  virtual void getImageParameterivCHROMIUM(
-      GLuint image_id,
-      GLenum pname,
-      GLint* params) {}
-  virtual void* mapImageCHROMIUM(
-      GLuint image_id,
-      GLenum access);
-  virtual void unmapImageCHROMIUM(GLuint image_id) {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(FakeWebGraphicsContext3D);
-};
-
-}  // namespace cc
-
-#endif  // CC_TEST_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
diff --git a/cc/test/test_web_graphics_context_3d.cc b/cc/test/test_web_graphics_context_3d.cc
index 3631812..6394b61 100644
--- a/cc/test/test_web_graphics_context_3d.cc
+++ b/cc/test/test_web_graphics_context_3d.cc
@@ -49,8 +49,7 @@ scoped_ptr<TestWebGraphicsContext3D> TestWebGraphicsContext3D::Create() {
 }
 
 TestWebGraphicsContext3D::TestWebGraphicsContext3D()
-    : FakeWebGraphicsContext3D(),
-      context_id_(s_context_id++),
+    : context_id_(s_context_id++),
       times_bind_texture_succeeds_(-1),
       times_end_query_succeeds_(-1),
       times_gen_mailbox_succeeds_(-1),
@@ -341,6 +340,8 @@ void TestWebGraphicsContext3D::CheckTextureIsBound(GLenum target) {
   DCHECK(BoundTextureId(target));
 }
 
+GLuint TestWebGraphicsContext3D::createQueryEXT() { return 1u; }
+
 void TestWebGraphicsContext3D::endQueryEXT(GLenum target) {
   if (times_end_query_succeeds_ >= 0) {
     if (!times_end_query_succeeds_) {
@@ -369,6 +370,63 @@ void TestWebGraphicsContext3D::getIntegerv(
     *value = GL_TEXTURE0;
 }
 
+void TestWebGraphicsContext3D::getProgramiv(GLuint program,
+                                            GLenum pname,
+                                            GLint* value) {
+  if (pname == GL_LINK_STATUS)
+    *value = 1;
+}
+
+void TestWebGraphicsContext3D::getShaderiv(GLuint shader,
+                                           GLenum pname,
+                                           GLint* value) {
+  if (pname == GL_COMPILE_STATUS)
+    *value = 1;
+}
+
+void TestWebGraphicsContext3D::getShaderPrecisionFormat(GLenum shadertype,
+                                                        GLenum precisiontype,
+                                                        GLint* range,
+                                                        GLint* precision) {
+  // Return the minimum precision requirements of the GLES2
+  // specification.
+  switch (precisiontype) {
+    case GL_LOW_INT:
+      range[0] = 8;
+      range[1] = 8;
+      *precision = 0;
+      break;
+    case GL_MEDIUM_INT:
+      range[0] = 10;
+      range[1] = 10;
+      *precision = 0;
+      break;
+    case GL_HIGH_INT:
+      range[0] = 16;
+      range[1] = 16;
+      *precision = 0;
+      break;
+    case GL_LOW_FLOAT:
+      range[0] = 8;
+      range[1] = 8;
+      *precision = 8;
+      break;
+    case GL_MEDIUM_FLOAT:
+      range[0] = 14;
+      range[1] = 14;
+      *precision = 10;
+      break;
+    case GL_HIGH_FLOAT:
+      range[0] = 62;
+      range[1] = 62;
+      *precision = 16;
+      break;
+    default:
+      NOTREACHED();
+      break;
+  }
+}
+
 void TestWebGraphicsContext3D::genMailboxCHROMIUM(GLbyte* mailbox) {
   if (times_gen_mailbox_succeeds_ >= 0) {
     if (!times_gen_mailbox_succeeds_) {
@@ -414,6 +472,13 @@ void TestWebGraphicsContext3D::flush() {
   test_support_->CallAllSyncPointCallbacks();
 }
 
+GLint TestWebGraphicsContext3D::getAttribLocation(GLuint program,
+                                                  const GLchar* name) {
+  return 0;
+}
+
+GLenum TestWebGraphicsContext3D::getError() { return GL_NO_ERROR; }
+
 void TestWebGraphicsContext3D::bindBuffer(GLenum target,
                                           GLuint buffer) {
   bound_buffer_ = buffer;
diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h
index 2b15976..1300a8f 100644
--- a/cc/test/test_web_graphics_context_3d.h
+++ b/cc/test/test_web_graphics_context_3d.h
@@ -17,7 +17,6 @@
 #include "base/stl_util.h"
 #include "base/synchronization/lock.h"
 #include "cc/output/context_provider.h"
-#include "cc/test/fake_web_graphics_context_3d.h"
 #include "cc/test/ordered_texture_map.h"
 #include "cc/test/test_texture.h"
 #include "third_party/khronos/GLES2/gl2.h"
@@ -26,7 +25,7 @@
 namespace cc {
 class TestContextSupport;
 
-class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
+class TestWebGraphicsContext3D {
  public:
   static scoped_ptr<TestWebGraphicsContext3D> Create();
 
@@ -40,23 +39,20 @@ class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
                                       int height,
                                       float scale_factor);
 
-  virtual bool isContextLost() OVERRIDE;
-
-  virtual void attachShader(GLuint program, GLuint shader) OVERRIDE;
-  virtual void bindFramebuffer(
-      GLenum target, GLuint framebuffer) OVERRIDE;
-  virtual void bindRenderbuffer(
-      GLenum target, GLuint renderbuffer) OVERRIDE;
-  virtual void bindTexture(
-      GLenum target,
-      GLuint texture_id) OVERRIDE;
-
-  virtual void texParameteri(GLenum target,
-                             GLenum pname,
-                             GLint param) OVERRIDE;
-  virtual void getTexParameteriv(GLenum target,
-                                 GLenum pname,
-                                 GLint* value) OVERRIDE;
+  virtual bool isContextLost();
+
+  virtual void discardFramebufferEXT(GLenum target,
+                                     GLsizei num_attachments,
+                                     const GLenum* attachments) {}
+
+  virtual void activeTexture(GLenum texture) {}
+  virtual void attachShader(GLuint program, GLuint shader);
+  virtual void bindFramebuffer(GLenum target, GLuint framebuffer);
+  virtual void bindRenderbuffer(GLenum target, GLuint renderbuffer);
+  virtual void bindTexture(GLenum target, GLuint texture_id);
+
+  virtual void texParameteri(GLenum target, GLenum pname, GLint param);
+  virtual void getTexParameteriv(GLenum target, GLenum pname, GLint* value);
   virtual void asyncTexImage2DCHROMIUM(GLenum target,
                                        GLint level,
                                        GLenum internalformat,
@@ -78,63 +74,97 @@ class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
   virtual void waitAsyncTexImage2DCHROMIUM(GLenum target) {}
   virtual void releaseTexImage2DCHROMIUM(GLenum target, GLint image_id) {}
 
-  virtual GLenum checkFramebufferStatus(GLenum target) OVERRIDE;
-
-  virtual GLint getUniformLocation(
-      GLuint program,
-      const GLchar* name) OVERRIDE;
-  virtual GLsizeiptr getVertexAttribOffset(
-      GLuint index,
-      GLenum pname) OVERRIDE;
-
-  virtual GLboolean isBuffer(GLuint buffer) OVERRIDE;
-  virtual GLboolean isEnabled(GLenum cap) OVERRIDE;
-  virtual GLboolean isFramebuffer(GLuint framebuffer) OVERRIDE;
-  virtual GLboolean isProgram(GLuint program) OVERRIDE;
-  virtual GLboolean isRenderbuffer(GLuint renderbuffer) OVERRIDE;
-  virtual GLboolean isShader(GLuint shader) OVERRIDE;
-  virtual GLboolean isTexture(GLuint texture) OVERRIDE;
-
-  virtual void useProgram(GLuint program) OVERRIDE;
-
-  virtual void genBuffers(GLsizei count, GLuint* ids) OVERRIDE;
-  virtual void genFramebuffers(GLsizei count, GLuint* ids) OVERRIDE;
-  virtual void genRenderbuffers(GLsizei count, GLuint* ids) OVERRIDE;
-  virtual void genTextures(GLsizei count, GLuint* ids) OVERRIDE;
-
-  virtual void deleteBuffers(GLsizei count, GLuint* ids) OVERRIDE;
-  virtual void deleteFramebuffers(
-      GLsizei count, GLuint* ids) OVERRIDE;
-  virtual void deleteRenderbuffers(
-      GLsizei count, GLuint* ids) OVERRIDE;
-  virtual void deleteTextures(GLsizei count, GLuint* ids) OVERRIDE;
-
-  virtual GLuint createBuffer() OVERRIDE;
-  virtual GLuint createFramebuffer() OVERRIDE;
-  virtual GLuint createRenderbuffer() OVERRIDE;
-  virtual GLuint createTexture() OVERRIDE;
-
-  virtual void deleteBuffer(GLuint id) OVERRIDE;
-  virtual void deleteFramebuffer(GLuint id) OVERRIDE;
-  virtual void deleteRenderbuffer(GLuint id) OVERRIDE;
-  virtual void deleteTexture(GLuint id) OVERRIDE;
-
-  virtual GLuint createProgram() OVERRIDE;
-  virtual GLuint createShader(GLenum) OVERRIDE;
+  virtual GLenum checkFramebufferStatus(GLenum target);
+
+  virtual void clear(GLbitfield mask) {}
+  virtual void clearColor(GLclampf red,
+                          GLclampf green,
+                          GLclampf blue,
+                          GLclampf alpha) {}
+  virtual void clearStencil(GLint s) {}
+  virtual void compressedTexImage2D(GLenum target,
+                                    GLint level,
+                                    GLenum internal_format,
+                                    GLsizei width,
+                                    GLsizei height,
+                                    GLint border,
+                                    GLsizei image_size,
+                                    const void* data) {}
+  virtual GLint getUniformLocation(GLuint program, const GLchar* name);
+  virtual GLsizeiptr getVertexAttribOffset(GLuint index, GLenum pname);
+
+  virtual GLboolean isBuffer(GLuint buffer);
+  virtual GLboolean isEnabled(GLenum cap);
+  virtual GLboolean isFramebuffer(GLuint framebuffer);
+  virtual GLboolean isProgram(GLuint program);
+  virtual GLboolean isRenderbuffer(GLuint renderbuffer);
+  virtual GLboolean isShader(GLuint shader);
+  virtual GLboolean isTexture(GLuint texture);
+
+  virtual void useProgram(GLuint program);
+
+  virtual void viewport(GLint x, GLint y, GLsizei width, GLsizei height) {}
+
+  virtual void genBuffers(GLsizei count, GLuint* ids);
+  virtual void genFramebuffers(GLsizei count, GLuint* ids);
+  virtual void genRenderbuffers(GLsizei count, GLuint* ids);
+  virtual void genTextures(GLsizei count, GLuint* ids);
+
+  virtual void deleteBuffers(GLsizei count, GLuint* ids);
+  virtual void deleteFramebuffers(GLsizei count, GLuint* ids);
+  virtual void deleteRenderbuffers(GLsizei count, GLuint* ids);
+  virtual void deleteTextures(GLsizei count, GLuint* ids);
+
+  virtual GLuint createBuffer();
+  virtual GLuint createFramebuffer();
+  virtual GLuint createRenderbuffer();
+  virtual GLuint createTexture();
+
+  virtual void deleteBuffer(GLuint id);
+  virtual void deleteFramebuffer(GLuint id);
+  virtual void deleteRenderbuffer(GLuint id);
+  virtual void deleteTexture(GLuint id);
+
+  virtual GLuint createProgram();
+  virtual GLuint createShader(GLenum);
   virtual GLuint createExternalTexture();
 
-  virtual void deleteProgram(GLuint id) OVERRIDE;
-  virtual void deleteShader(GLuint id) OVERRIDE;
-
-  virtual void endQueryEXT(GLenum target) OVERRIDE;
-  virtual void getQueryObjectuivEXT(
-      GLuint query,
-      GLenum pname,
-      GLuint* params) OVERRIDE;
-
-  virtual void getIntegerv(
-      GLenum pname,
-      GLint* value) OVERRIDE;
+  virtual void deleteProgram(GLuint id);
+  virtual void deleteShader(GLuint id);
+
+  virtual void texStorage2DEXT(GLenum target,
+                               GLint levels,
+                               GLuint internalformat,
+                               GLint width,
+                               GLint height) {}
+
+  virtual GLuint createQueryEXT();
+  virtual void deleteQueryEXT(GLuint query) {}
+  virtual void beginQueryEXT(GLenum target, GLuint query) {}
+  virtual void endQueryEXT(GLenum target);
+  virtual void getQueryObjectuivEXT(GLuint query, GLenum pname, GLuint* params);
+
+  virtual void scissor(GLint x, GLint y, GLsizei width, GLsizei height) {}
+
+  virtual void texImage2D(GLenum target,
+                          GLint level,
+                          GLenum internalformat,
+                          GLsizei width,
+                          GLsizei height,
+                          GLint border,
+                          GLenum format,
+                          GLenum type,
+                          const void* pixels) {}
+
+  virtual void texSubImage2D(GLenum target,
+                             GLint level,
+                             GLint xoffset,
+                             GLint yoffset,
+                             GLsizei width,
+                             GLsizei height,
+                             GLenum format,
+                             GLenum type,
+                             const void* pixels) {}
 
   virtual void genMailboxCHROMIUM(GLbyte* mailbox);
   virtual void produceTextureCHROMIUM(GLenum target,
@@ -142,34 +172,75 @@ class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
   virtual void consumeTextureCHROMIUM(GLenum target,
                                       const GLbyte* mailbox) { }
 
-  virtual void loseContextCHROMIUM(GLenum current,
-                                   GLenum other) OVERRIDE;
+  virtual void loseContextCHROMIUM(GLenum current, GLenum other);
+
+  virtual void bindTexImage2DCHROMIUM(GLenum target, GLint image_id) {}
+
+  virtual void drawArrays(GLenum mode, GLint first, GLsizei count) {}
+  virtual void drawElements(GLenum mode,
+                            GLsizei count,
+                            GLenum type,
+                            GLintptr offset) {}
+  virtual void disable(GLenum cap) {}
+  virtual void enable(GLenum cap) {}
+  virtual void finish();
+  virtual void flush();
+  virtual void shallowFlushCHROMIUM() {}
+
+  virtual void getAttachedShaders(GLuint program,
+                                  GLsizei max_count,
+                                  GLsizei* count,
+                                  GLuint* shaders) {}
+  virtual GLint getAttribLocation(GLuint program, const GLchar* name);
+  virtual void getBooleanv(GLenum pname, GLboolean* value) {}
+  virtual void getBufferParameteriv(GLenum target, GLenum pname, GLint* value) {
+  }
+  virtual GLenum getError();
+  virtual void getFloatv(GLenum pname, GLfloat* value) {}
+  virtual void getFramebufferAttachmentParameteriv(GLenum target,
+                                                   GLenum attachment,
+                                                   GLenum pname,
+                                                   GLint* value) {}
+
+  virtual void getIntegerv(GLenum pname, GLint* value);
+
+  virtual void getProgramiv(GLuint program, GLenum pname, GLint* value);
+
+  virtual void getRenderbufferParameteriv(GLenum target,
+                                          GLenum pname,
+                                          GLint* value) {}
+
+  virtual void getShaderiv(GLuint shader, GLenum pname, GLint* value);
+
+  virtual void getShaderPrecisionFormat(GLenum shadertype,
+                                        GLenum precisiontype,
+                                        GLint* range,
+                                        GLint* precision);
 
-  virtual void finish() OVERRIDE;
-  virtual void flush() OVERRIDE;
+  virtual void getTexParameterfv(GLenum target, GLenum pname, GLfloat* value) {}
+  virtual void getUniformfv(GLuint program, GLint location, GLfloat* value) {}
+  virtual void getUniformiv(GLuint program, GLint location, GLint* value) {}
+  virtual void getVertexAttribfv(GLuint index, GLenum pname, GLfloat* value) {}
+  virtual void getVertexAttribiv(GLuint index, GLenum pname, GLint* value) {}
 
-  virtual void bindBuffer(GLenum target, GLuint buffer) OVERRIDE;
+  virtual void bindBuffer(GLenum target, GLuint buffer);
   virtual void bufferData(GLenum target,
                           GLsizeiptr size,
                           const void* data,
-                          GLenum usage) OVERRIDE;
+                          GLenum usage);
   virtual void* mapBufferCHROMIUM(GLenum target,
                                   GLenum access);
   virtual GLboolean unmapBufferCHROMIUM(GLenum target);
 
-  virtual GLuint createImageCHROMIUM(
-      GLsizei width,
-      GLsizei height,
-      GLenum internalformat) OVERRIDE;
-  virtual void destroyImageCHROMIUM(GLuint image_id) OVERRIDE;
-  virtual void getImageParameterivCHROMIUM(
-      GLuint image_id,
-      GLenum pname,
-      GLint* params) OVERRIDE;
-  virtual void* mapImageCHROMIUM(
-      GLuint image_id,
-      GLenum access) OVERRIDE;
-  virtual void unmapImageCHROMIUM(GLuint image_id) OVERRIDE;
+  virtual GLuint createImageCHROMIUM(GLsizei width,
+                                     GLsizei height,
+                                     GLenum internalformat);
+  virtual void destroyImageCHROMIUM(GLuint image_id);
+  virtual void getImageParameterivCHROMIUM(GLuint image_id,
+                                           GLenum pname,
+                                           GLint* params);
+  virtual void* mapImageCHROMIUM(GLuint image_id, GLenum access);
+  virtual void unmapImageCHROMIUM(GLuint image_id);
   virtual void texImageIOSurface2DCHROMIUM(GLenum target,
                                            GLsizei width,
                                            GLsizei height,