diff options
Diffstat (limited to 'gpu/command_buffer/service/framebuffer_manager_unittest.cc')
-rw-r--r-- | gpu/command_buffer/service/framebuffer_manager_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc index 86bb87f..b73a776 100644 --- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc +++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc @@ -2,9 +2,9 @@ // 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/error_state_mock.h" #include "gpu/command_buffer/service/framebuffer_manager.h" #include "gpu/command_buffer/service/feature_info.h" -#include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" #include "gpu/command_buffer/service/renderbuffer_manager.h" #include "gpu/command_buffer/service/test_helper.h" #include "gpu/command_buffer/service/texture_manager.h" @@ -132,7 +132,7 @@ class FramebufferInfoTest : public testing::Test { gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>()); ::gfx::GLInterface::SetGLInterface(gl_.get()); manager_.CreateFramebuffer(kClient1Id, kService1Id); - decoder_.reset(new ::testing::StrictMock<gles2::MockGLES2Decoder>()); + error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>()); framebuffer_ = manager_.GetFramebuffer(kClient1Id); ASSERT_TRUE(framebuffer_ != NULL); } @@ -148,7 +148,7 @@ class FramebufferInfoTest : public testing::Test { Framebuffer* framebuffer_; TextureManager texture_manager_; RenderbufferManager renderbuffer_manager_; - scoped_ptr<MockGLES2Decoder> decoder_; + scoped_ptr<MockErrorState> error_state_; }; // GCC requires these declarations, but MSVC requires they not be present @@ -732,7 +732,7 @@ TEST_F(FramebufferInfoTest, GetStatus) { // Check changing the format calls CheckFramebuffferStatus. TestHelper::SetTexParameterWithExpectations( - gl_.get(), decoder_.get(), &texture_manager_, + gl_.get(), error_state_.get(), &texture_manager_, texture2, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE, GL_NO_ERROR); EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_READ_FRAMEBUFFER)) @@ -752,7 +752,7 @@ TEST_F(FramebufferInfoTest, GetStatus) { .RetiresOnSaturation(); } TestHelper::SetTexParameterWithExpectations( - gl_.get(), decoder_.get(), &texture_manager_, + gl_.get(), error_state_.get(), &texture_manager_, texture2, GL_TEXTURE_WRAP_S, GL_REPEAT, GL_NO_ERROR); framebuffer_->GetStatus(&texture_manager_, GL_READ_FRAMEBUFFER); |