| Index: gpu/command_buffer/service/vertex_array_manager_unittest.cc
|
| diff --git a/gpu/command_buffer/service/vertex_array_manager_unittest.cc b/gpu/command_buffer/service/vertex_array_manager_unittest.cc
|
| index 617a5f60aff67beedf0bb3ac8015e1f748e83c85..4594d542c68496730cf6b9722add3a980e8bce03 100644
|
| --- a/gpu/command_buffer/service/vertex_array_manager_unittest.cc
|
| +++ b/gpu/command_buffer/service/vertex_array_manager_unittest.cc
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "gpu/command_buffer/service/feature_info.h"
|
| +#include "gpu/command_buffer/service/gpu_service_test.h"
|
| #include "gpu/command_buffer/service/test_helper.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/gl/gl_mock.h"
|
| @@ -17,7 +18,7 @@ using ::testing::_;
|
| namespace gpu {
|
| namespace gles2 {
|
|
|
| -class VertexArrayManagerTest : public testing::Test {
|
| +class VertexArrayManagerTest : public GpuServiceTest {
|
| public:
|
| static const uint32 kNumVertexAttribs = 8;
|
|
|
| @@ -29,20 +30,15 @@ class VertexArrayManagerTest : public testing::Test {
|
|
|
| protected:
|
| virtual void SetUp() {
|
| - gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>());
|
| - ::gfx::MockGLInterface::SetGLInterface(gl_.get());
|
| -
|
| + GpuServiceTest::SetUp();
|
| manager_ = new VertexArrayManager();
|
| }
|
|
|
| virtual void TearDown() {
|
| + GpuServiceTest::TearDown();
|
| delete manager_;
|
| - ::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_;
|
| VertexArrayManager* manager_;
|
| };
|
|
|
|
|