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

gpu/command_buffer/service/buffer_manager.cc

Index: gpu/command_buffer/service/buffer_manager.cc
diff --git a/gpu/command_buffer/service/buffer_manager.cc b/gpu/command_buffer/service/buffer_manager.cc
index 65dd2af31d1a3aee9313ef4db4a7da5136c0f6f8..7fe9d2096c2eeff32fb51f1a0941fd45782dcb5b 100644
--- a/gpu/command_buffer/service/buffer_manager.cc
+++ b/gpu/command_buffer/service/buffer_manager.cc
@@ -7,8 +7,8 @@
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
+#include "gpu/command_buffer/service/error_state.h"
 #include "gpu/command_buffer/service/feature_info.h"
-#include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "ui/gl/gl_bindings.h"
 
@@ -253,7 +253,7 @@ void BufferManager::SetInfo(
 }
 
 void BufferManager::DoBufferData(
-    GLES2Decoder* decoder,
+    ErrorState* error_state,
     Buffer* buffer,
     GLsizeiptr size,
     GLenum usage,
@@ -266,13 +266,13 @@ void BufferManager::DoBufferData(
     data = zero.get();
   }
 
-  GLESDECODER_COPY_REAL_GL_ERRORS_TO_WRAPPER(decoder, "glBufferData");
+  ERRORSTATE_COPY_REAL_GL_ERRORS_TO_WRAPPER(error_state, "glBufferData");
   if (IsUsageClientSideArray(usage)) {
     glBufferData(buffer->target(), 0, NULL, usage);
   } else {
     glBufferData(buffer->target(), size, data, usage);
   }
-  GLenum error = GLESDECODER_PEEK_GL_ERROR(decoder, "glBufferData");
+  GLenum error = ERRORSTATE_PEEK_GL_ERROR(error_state, "glBufferData");
   if (error == GL_NO_ERROR) {
     SetInfo(buffer, size, usage, data);
   } else {
@@ -281,14 +281,14 @@ void BufferManager::DoBufferData(
 }
 
 void BufferManager::DoBufferSubData(
-    GLES2Decoder* decoder,
+    ErrorState* error_state,
     Buffer* buffer,
     GLintptr offset,
     GLsizeiptr size,
     const GLvoid* data) {
   if (!buffer->SetRange(offset, size, data)) {
-    GLESDECODER_SET_GL_ERROR(
-        decoder, GL_INVALID_VALUE, "glBufferSubData", "out of range");
+    ERRORSTATE_SET_GL_ERROR(
+        error_state, GL_INVALID_VALUE, "glBufferSubData", "out of range");
     return;
   }