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

gpu/command_buffer/service/test_helper.cc

 // 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.
 
 #include "gpu/command_buffer/service/test_helper.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_tokenizer.h"
 #include "gpu/command_buffer/common/types.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
+#include "gpu/command_buffer/service/error_state_mock.h"
 #include "gpu/command_buffer/service/gl_utils.h"
-#include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/command_buffer/service/program_manager.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_mock.h"
 
 using ::testing::_;
 using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::MatcherCast;
@@ skipping 465 matching lines @@
   EXPECT_CALL(*gl,
       LinkProgram(service_id))
       .Times(1)
       .RetiresOnSaturation();
 
   SetupProgramSuccessExpectations(
       gl, attribs, num_attribs, uniforms, num_uniforms, service_id);
 }
 
 void TestHelper::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) {
-  EXPECT_CALL(*decoder, CopyRealGLErrorsToWrapper(_, _, _))
+  EXPECT_CALL(*error_state, CopyRealGLErrorsToWrapper(_, _, _))
       .Times(1)
       .RetiresOnSaturation();
   if (manager->IsUsageClientSideArray(usage)) {
     EXPECT_CALL(*gl, BufferData(
         buffer->target(), 0, _, usage))
         .Times(1)
         .RetiresOnSaturation();
   } else {
     EXPECT_CALL(*gl, BufferData(
         buffer->target(), size, _, usage))
         .Times(1)
         .RetiresOnSaturation();
   }
-  EXPECT_CALL(*decoder, PeekGLError(_, _, _))
+  EXPECT_CALL(*error_state, PeekGLError(_, _, _))
       .WillOnce(Return(error))
       .RetiresOnSaturation();
-  manager->DoBufferData(decoder, buffer, size, usage, data);
+  manager->DoBufferData(error_state, buffer, size, usage, data);
 }
 
 void TestHelper::SetTexParameterWithExpectations(
-    ::gfx::MockGLInterface* gl, MockGLES2Decoder* decoder,
+    ::gfx::MockGLInterface* gl, MockErrorState* error_state,
     TextureManager* manager, Texture* texture,
     GLenum pname, GLint value, GLenum error) {
   if (error == GL_NO_ERROR) {
     if (pname != GL_TEXTURE_POOL_CHROMIUM) {
       EXPECT_CALL(*gl, TexParameteri(texture->target(), pname, value))
           .Times(1)
           .RetiresOnSaturation();
     }
   } else if (error == GL_INVALID_ENUM) {
-    EXPECT_CALL(*decoder, SetGLErrorInvalidEnum(_, _, _, value, _))
+    EXPECT_CALL(*error_state, SetGLErrorInvalidEnum(_, _, _, value, _))
         .Times(1)
         .RetiresOnSaturation();
   } else {
-    EXPECT_CALL(*decoder, SetGLErrorInvalidParam(_, _, error, _, _, _))
+    EXPECT_CALL(*error_state, SetGLErrorInvalidParam(_, _, error, _, _, _))
         .Times(1)
         .RetiresOnSaturation();
   }
-  manager->SetParameter("", decoder, texture, pname, value);
+  manager->SetParameter("", error_state, texture, pname, value);
 }
 
 ScopedGLImplementationSetter::ScopedGLImplementationSetter(
     gfx::GLImplementation implementation)
     : old_implementation_(gfx::GetGLImplementation()) {
   gfx::SetGLImplementation(implementation);
 }
 
 ScopedGLImplementationSetter::~ScopedGLImplementationSetter() {
   gfx::SetGLImplementation(old_implementation_);
 }
 
 }  // namespace gles2
 }  // namespace gpu