Index: gpu/command_buffer/service/framebuffer_manager_unittest.cc |
diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc |
index a27e6aeb24bea82701b82229749a73acfafde2f0..1ded5585e453620bc463eb935a775b9f66c346f7 100644 |
--- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc |
+++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc |
@@ -5,6 +5,7 @@ |
#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/gpu_service_test.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" |
@@ -29,7 +30,7 @@ const bool kUseDefaultTextures = false; |
} // namespace |
-class FramebufferManagerTest : public testing::Test { |
+class FramebufferManagerTest : public GpuServiceTest { |
public: |
FramebufferManagerTest() |
: manager_(1, 1), |
@@ -49,18 +50,7 @@ class FramebufferManagerTest : public testing::Test { |
} |
protected: |
- virtual void SetUp() { |
- gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>()); |
- ::gfx::MockGLInterface::SetGLInterface(gl_.get()); |
- } |
- |
- virtual void TearDown() { |
- ::gfx::MockGLInterface::SetGLInterface(NULL); |
- gl_.reset(); |
- } |
- // Use StrictMock to make 100% sure we know how GL will be called. |
- scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_; |
FramebufferManager manager_; |
TextureManager texture_manager_; |
RenderbufferManager renderbuffer_manager_; |
@@ -110,7 +100,7 @@ TEST_F(FramebufferManagerTest, Destroy) { |
ASSERT_TRUE(framebuffer1 == NULL); |
} |
-class FramebufferInfoTest : public testing::Test { |
+class FramebufferInfoTest : public GpuServiceTest { |
public: |
static const GLuint kClient1Id = 1; |
static const GLuint kService1Id = 11; |
@@ -138,8 +128,7 @@ class FramebufferInfoTest : public testing::Test { |
} |
void InitializeContext(const char* gl_version, const char* extensions) { |
- gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>()); |
- ::gfx::MockGLInterface::SetGLInterface(gl_.get()); |
+ GpuServiceTest::SetUp(); |
TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(), |
extensions, "", gl_version); |
feature_info_->Initialize(); |
@@ -149,13 +138,6 @@ class FramebufferInfoTest : public testing::Test { |
ASSERT_TRUE(framebuffer_ != NULL); |
} |
- virtual void TearDown() { |
- ::gfx::MockGLInterface::SetGLInterface(NULL); |
- gl_.reset(); |
- } |
- |
- // Use StrictMock to make 100% sure we know how GL will be called. |
- scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_; |
FramebufferManager manager_; |
Framebuffer* framebuffer_; |
scoped_refptr<FeatureInfo> feature_info_; |