1 files changed, 4 insertions, 12 deletions
diff --git a/chromium/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc b/chromium/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
index 28a051c97b2..e7fd6905474 100644
--- a/chromium/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
+++ b/chromium/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
@@ -8,6 +8,7 @@
 #include "gpu/command_buffer/service/buffer_manager.h"
 #include "gpu/command_buffer/service/error_state_mock.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"
@@ -18,7 +19,7 @@ using ::testing::_;
 namespace gpu {
 namespace gles2 {
 
-class VertexAttribManagerTest : public testing::Test {
+class VertexAttribManagerTest : public GpuServiceTest {
  public:
   static const uint32 kNumVertexAttribs = 8;
 
@@ -30,8 +31,7 @@ class VertexAttribManagerTest : public testing::Test {
 
  protected:
   virtual void SetUp() {
-    gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>());
-    ::gfx::GLInterface::SetGLInterface(gl_.get());
+    GpuServiceTest::SetUp();
 
     for (uint32 ii = 0; ii < kNumVertexAttribs; ++ii) {
       EXPECT_CALL(*gl_, VertexAttrib4f(ii, 0.0f, 0.0f, 0.0f, 1.0f))
@@ -40,17 +40,9 @@ class VertexAttribManagerTest : public testing::Test {
     }
 
     manager_ = new VertexAttribManager();
-    manager_->Initialize(kNumVertexAttribs);
+    manager_->Initialize(kNumVertexAttribs, true);
   }
 
-  virtual void TearDown() {
-    manager_ = NULL;
-    ::gfx::GLInterface::SetGLInterface(NULL);
-    gl_.reset();
-  }
-
-  // Use StrictMock to make 100% sure we know how GL will be called.
-  scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_;
   scoped_refptr<VertexAttribManager> manager_;
 };