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

 // 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/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"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_mock.h"
 
 using ::testing::_;
 using ::testing::InSequence;
 using ::testing::Return;
@@ skipping 527 matching lines @@
   ASSERT_TRUE(query != NULL);
 
   // Setup shared memory like client would.
   QuerySync* sync = decoder_->GetSharedMemoryAs<QuerySync*>(
       kSharedMemoryId, kSharedMemoryOffset, sizeof(*sync));
   ASSERT_TRUE(sync != NULL);
   sync->Reset();
 
   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();
 
   EXPECT_TRUE(manager->EndQuery(query, kSubmitCount));
   EXPECT_FALSE(query->pending());
 
   EXPECT_EQ(static_cast<GLuint>(GL_INVALID_ENUM), sync->result);
 
   manager->Destroy(false);
 }
 
 }  // namespace gles2
 }  // namespace gpu