Clean up of GLES2 Command Decoder by moving some of the error state into a separate class.

gpu/command_buffer/service/test_helper.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_TEST_HELPER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_TEST_HELPER_H_
 
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_mock.h"
 
 namespace gpu {
 namespace gles2 {
 
 struct DisallowedFeatures;
 class Buffer;
 class BufferManager;
-class MockGLES2Decoder;
+class MockErrorState;
 class Texture;
 class TextureManager;
 
 class TestHelper {
  public:
   static const GLuint kServiceBlackTexture2dId = 701;
   static const GLuint kServiceDefaultTexture2dId = 702;
   static const GLuint kServiceBlackTextureCubemapId = 703;
   static const GLuint kServiceDefaultTextureCubemapId = 704;
   static const GLuint kServiceBlackExternalTextureId = 705;
@@ skipping 57 matching lines @@
       AttribInfo* attribs, size_t num_attribs,
       UniformInfo* uniforms, size_t num_uniforms,
       GLuint service_id);
 
   static void SetupProgramSuccessExpectations(::gfx::MockGLInterface* gl,
       AttribInfo* attribs, size_t num_attribs,
       UniformInfo* uniforms, size_t num_uniforms,
       GLuint service_id);
 
   static void DoBufferData(
-      ::gfx::MockGLInterface* gl, MockGLES2Decoder* decoder,
+      ::gfx::MockGLInterface* gl, MockErrorState* error_state,
       BufferManager* manager, Buffer* buffer, GLsizeiptr size, GLenum usage,
       const GLvoid* data, GLenum error);
 
   static void SetTexParameterWithExpectations(
-      ::gfx::MockGLInterface* gl, MockGLES2Decoder* decoder,
+      ::gfx::MockGLInterface* gl, MockErrorState* error_state,
       TextureManager* manager, Texture* texture,
       GLenum pname, GLint value, GLenum error);
 
  private:
   static void SetupTextureInitializationExpectations(
        ::gfx::MockGLInterface* gl, GLenum target);
   static void SetupTextureDestructionExpectations(
        ::gfx::MockGLInterface* gl, GLenum target);
 };
 
 // This object temporaritly Sets what gfx::GetGLImplementation returns. During
 // testing the GLImplementation is set to kGLImplemenationMockGL but lots of
 // code branches based on what gfx::GetGLImplementation returns.
 class ScopedGLImplementationSetter {
  public:
   explicit ScopedGLImplementationSetter(gfx::GLImplementation implementation);
   ~ScopedGLImplementationSetter();
 
  private:
   gfx::GLImplementation old_implementation_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_TEST_HELPER_H_