Index: gpu/command_buffer/service/shader_manager_unittest.cc |
diff --git a/gpu/command_buffer/service/shader_manager_unittest.cc b/gpu/command_buffer/service/shader_manager_unittest.cc |
index 1f48f2deda5f3f07bd7062b094c28795e2948535..b5b7b383984d2dbd45e61bbe485ca520900f4fc2 100644 |
--- a/gpu/command_buffer/service/shader_manager_unittest.cc |
+++ b/gpu/command_buffer/service/shader_manager_unittest.cc |
@@ -5,6 +5,7 @@ |
#include "gpu/command_buffer/service/shader_manager.h" |
#include "base/memory/scoped_ptr.h" |
+#include "gpu/command_buffer/service/gpu_service_test.h" |
#include "gpu/command_buffer/service/mocks.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "ui/gl/gl_mock.h" |
@@ -15,7 +16,7 @@ using ::testing::ReturnRef; |
namespace gpu { |
namespace gles2 { |
-class ShaderManagerTest : public testing::Test { |
+class ShaderManagerTest : public GpuServiceTest { |
public: |
ShaderManagerTest() { |
} |
@@ -25,18 +26,6 @@ class ShaderManagerTest : 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_; |
ShaderManager manager_; |
}; |