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

gpu/command_buffer/service/query_manager_unittest.cc

Index: gpu/command_buffer/service/query_manager_unittest.cc
diff --git a/gpu/command_buffer/service/query_manager_unittest.cc b/gpu/command_buffer/service/query_manager_unittest.cc
index 74110145ee8e6ad0033e9c269d6b15bae8822c30..63ad4f5b27c426a9f95db383825953985d926d24 100644
--- a/gpu/command_buffer/service/query_manager_unittest.cc
+++ b/gpu/command_buffer/service/query_manager_unittest.cc
@@ -5,6 +5,7 @@
 #include "gpu/command_buffer/service/query_manager.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
+#include "gpu/command_buffer/service/error_state_mock.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
 #include "gpu/command_buffer/service/feature_info.h"
@@ -552,7 +553,10 @@ TEST_F(QueryManagerTest, GetErrorQuery) {
 
   EXPECT_TRUE(manager->BeginQuery(query));
 
-  EXPECT_CALL(*decoder_.get(), GetGLError())
+  MockErrorState mock_error_state;
+  EXPECT_CALL(*decoder_.get(), GetErrorState())
+      .WillRepeatedly(Return(&mock_error_state));
+  EXPECT_CALL(mock_error_state, GetGLError())
       .WillOnce(Return(GL_INVALID_ENUM))
       .RetiresOnSaturation();