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

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

Index: trunk/src/gpu/command_buffer/service/gpu_tracer_unittest.cc
===================================================================
--- trunk/src/gpu/command_buffer/service/gpu_tracer_unittest.cc	(revision 278063)
+++ trunk/src/gpu/command_buffer/service/gpu_tracer_unittest.cc	(working copy)
@@ -5,7 +5,6 @@
 #include <map>
 #include <set>
 
-#include "gpu/command_buffer/service/gpu_service_test.h"
 #include "gpu/command_buffer/service/gpu_tracer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_mock.h"
@@ -13,6 +12,7 @@
 namespace gpu {
 namespace gles2 {
 
+using ::gfx::MockGLInterface;
 using ::testing::InvokeWithoutArgs;
 using ::testing::Return;
 using ::testing::ReturnRef;
@@ -109,7 +109,7 @@
   std::map<GLuint, GLint64> query_timestamp_;
 };
 
-class GpuTracerTest : public GpuServiceTest {
+class GpuTracerTest : public testing::Test {
  public:
   GpuTracerTest() {}
 
@@ -117,14 +117,15 @@
 
  protected:
   virtual void SetUp() {
-    GpuServiceTest::SetUp();
+    gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>());
+    ::gfx::MockGLInterface::SetGLInterface(gl_.get());
     gl_fake_queries_.Reset();
   }
 
   virtual void TearDown() {
+    ::gfx::MockGLInterface::SetGLInterface(NULL);
     gl_.reset();
     gl_fake_queries_.Reset();
-    GpuServiceTest::TearDown();
   }
 
   void SetupTimerQueryMocks() {
@@ -153,6 +154,7 @@
              Invoke(&gl_fake_queries_, &GlFakeQueries::DeleteQueries));
   }
 
+  scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_;
   GlFakeQueries gl_fake_queries_;
 };