Revert 278059 "gpu: Add base class for gpu service tests"

trunk/src/gpu/command_buffer/service/vertex_array_manager_unittest.cc

Index: trunk/src/gpu/command_buffer/service/vertex_array_manager_unittest.cc
===================================================================
--- trunk/src/gpu/command_buffer/service/vertex_array_manager_unittest.cc	(revision 278063)
+++ trunk/src/gpu/command_buffer/service/vertex_array_manager_unittest.cc	(working copy)
@@ -7,7 +7,6 @@
 
 #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"
@@ -18,7 +17,7 @@
 namespace gpu {
 namespace gles2 {
 
-class VertexArrayManagerTest : public GpuServiceTest {
+class VertexArrayManagerTest : public testing::Test {
  public:
   static const uint32 kNumVertexAttribs = 8;
 
@@ -30,16 +29,21 @@
 
  protected:
   virtual void SetUp() {
-    GpuServiceTest::SetUp();
-    manager_.reset(new VertexArrayManager());
+    gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>());
+    ::gfx::MockGLInterface::SetGLInterface(gl_.get());
+
+    manager_ = new VertexArrayManager();
   }
 
   virtual void TearDown() {
-    manager_.reset();
-    GpuServiceTest::TearDown();
+    delete manager_;
+    ::gfx::MockGLInterface::SetGLInterface(NULL);
+    gl_.reset();
   }
 
-  scoped_ptr<VertexArrayManager> manager_;
+  // Use StrictMock to make 100% sure we know how GL will be called.
+  scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_;
+  VertexArrayManager* manager_;
 };
 
 // GCC requires these declarations, but MSVC requires they not be present