Make TextureManager correctly delete default textures.

The default textures were not tracked correctly.
This fixes that issue

TEST=unit tests and GLES2 conformance tests no longer crash
BUG=none


Review URL: https://chromiumcodereview.appspot.com/10549002

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

1 files changed, 8 insertions, 4 deletions

diff --git a/gpu/command_buffer/service/test_helper.h b/gpu/command_buffer/service/test_helper.h
index d083e42..7515e6c 100644
--- a/gpu/command_buffer/service/test_helper.h
+++ b/gpu/command_buffer/service/test_helper.h
@@ -66,8 +66,10 @@ class TestHelper {
       const char* extensions,
       const char* vendor,
       const char* renderer);
-  static void SetupTextureManagerInitExpectations(::gfx::MockGLInterface* gl,
-                                                  const char* extensions);
+  static void SetupTextureManagerInitExpectations(
+      ::gfx::MockGLInterface* gl, const char* extensions);
+  static void SetupTextureManagerDestructionExpectations(
+      ::gfx::MockGLInterface* gl, const char* extensions);
 
   static void SetupExpectationsForClearingUniforms(
       ::gfx::MockGLInterface* gl, UniformInfo* uniforms, size_t num_uniforms);
@@ -79,8 +81,10 @@ class TestHelper {
       GLuint service_id);
 
  private:
-  static void SetupTextureInitializationExpectations(::gfx::MockGLInterface* gl,
-                                                     GLenum target);
+  static void SetupTextureInitializationExpectations(
+       ::gfx::MockGLInterface* gl, GLenum target);
+  static void SetupTextureDestructionExpectations(
+       ::gfx::MockGLInterface* gl, GLenum target);
 };
 
 }  // namespace gles2