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

gpu/command_buffer/service/gles2_cmd_decoder_mock.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.
 
 // This file contains the mock GLES2Decoder class.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_MOCK_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_MOCK_H_
 
 #include <vector>
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "base/callback_forward.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/gfx/size.h"
 
 namespace gfx {
 class GLContext;
 class GLSurface;
 }
 
 namespace gpu {
 class StreamTextureManager;
 
 namespace gles2 {
 
 class ContextGroup;
+class ErrorState;
 class QueryManager;
 
 class MockGLES2Decoder : public GLES2Decoder {
  public:
   MockGLES2Decoder();
   virtual ~MockGLES2Decoder();
 
   MOCK_METHOD7(Initialize,
                bool(const scoped_refptr<gfx::GLSurface>& surface,
                     const scoped_refptr<gfx::GLContext>& context,
@@ skipping 44 matching lines @@
   MOCK_METHOD9(ClearLevel, bool(
       unsigned service_id,
       unsigned bind_target,
       unsigned target,
       int level,
       unsigned format,
       unsigned type,
       int width,
       int height,
       bool is_texture_immutable));
-  MOCK_METHOD0(GetGLError, uint32());
-  MOCK_METHOD5(SetGLError, void(
-      const char* filename, int line,
-      unsigned error, const char* function_name, const char* msg));
-  MOCK_METHOD5(SetGLErrorInvalidEnum, void(
-      const char* filename, int line,
-      const char* function_name, unsigned value, const char* label));
-  MOCK_METHOD6(SetGLErrorInvalidParam, void(
-      const char* filename,
-      int line,
-      unsigned error,
-      const char* function_name,
-      unsigned pname,
-      int param));
-  MOCK_METHOD3(PeekGLError, unsigned(
-      const char* file, int line, const char* filename));
-  MOCK_METHOD3(CopyRealGLErrorsToWrapper, void(
-      const char* file, int line, const char* filename));
-  MOCK_METHOD3(ClearRealGLErrors, void(
-      const char* file, int line, const char* filename));
+  MOCK_METHOD0(GetErrorState, ErrorState *());
 
   MOCK_METHOD0(GetLogger, Logger*());
   MOCK_METHOD1(SetShaderCacheCallback,
                void(const ShaderCacheCallback& callback));
   MOCK_METHOD1(SetWaitSyncPointCallback,
                void(const WaitSyncPointCallback& callback));
   MOCK_METHOD0(GetTextureUploadCount, uint32());
   MOCK_METHOD0(GetTotalTextureUploadTime, base::TimeDelta());
   MOCK_METHOD0(GetTotalProcessingCommandsTime, base::TimeDelta());
   MOCK_METHOD1(AddProcessingCommandsTime, void(base::TimeDelta));
   MOCK_METHOD0(WasContextLost, bool());
   MOCK_METHOD1(LoseContext, void(uint32 reset_status));
 
   DISALLOW_COPY_AND_ASSIGN(MockGLES2Decoder);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_MOCK_H_