Revert of gpu: Add base class for gpu service tests

gpu/command_buffer/service/gpu_tracer_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 
 namespace gpu {
 namespace gles2 {
 
+using ::gfx::MockGLInterface;
 using ::testing::InvokeWithoutArgs;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ::testing::ReturnPointee;
 using ::testing::NotNull;
 using ::testing::ElementsAreArray;
 using ::testing::ElementsAre;
 using ::testing::SetArrayArgument;
 using ::testing::AtLeast;
 using ::testing::SetArgPointee;
@@ skipping 76 matching lines @@
     }
   }
 
  protected:
   GLint64 current_time_;
   GLuint next_query_id_;
   std::set<GLuint> alloced_queries_;
   std::map<GLuint, GLint64> query_timestamp_;
 };
 
-class GpuTracerTest : public GpuServiceTest {
+class GpuTracerTest : public testing::Test {
  public:
   GpuTracerTest() {}
 
   ///////////////////////////////////////////////////////////////////////////
 
  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() {
     // Delegate query APIs used by GLARBTimerTrace to a GlFakeQueries
     EXPECT_CALL(*gl_, GenQueries(_, NotNull())).Times(AtLeast(1)).WillOnce(
         Invoke(&gl_fake_queries_, &GlFakeQueries::GenQueries));
 
     EXPECT_CALL(*gl_, GetQueryObjectiv(_, GL_QUERY_RESULT_AVAILABLE, NotNull()))
         .Times(AtLeast(2))
         .WillRepeatedly(
              Invoke(&gl_fake_queries_, &GlFakeQueries::GetQueryObjectiv));
 
     EXPECT_CALL(*gl_, QueryCounter(_, GL_TIMESTAMP))
         .Times(AtLeast(2))
         .WillRepeatedly(
              Invoke(&gl_fake_queries_, &GlFakeQueries::QueryCounter));
 
     EXPECT_CALL(*gl_, GetQueryObjectui64v(_, GL_QUERY_RESULT, NotNull()))
         .Times(AtLeast(2))
         .WillRepeatedly(
              Invoke(&gl_fake_queries_, &GlFakeQueries::GetQueryObjectui64v));
 
     EXPECT_CALL(*gl_, DeleteQueries(2, NotNull()))
         .Times(AtLeast(1))
         .WillRepeatedly(
              Invoke(&gl_fake_queries_, &GlFakeQueries::DeleteQueries));
   }
 
+  scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_;
   GlFakeQueries gl_fake_queries_;
 };
 
 TEST_F(GpuTracerTest, GLARBTimerTrace) {
   // Test basic timer query functionality
   {
     MockOutputter* outputter = new MockOutputter();
     scoped_refptr<Outputter> outputter_ref = outputter;
 
     SetupTimerQueryMocks();
@@ skipping 34 matching lines @@
     gl_fake_queries_.SetCurrentGLTime(end_timestamp);
     EXPECT_TRUE(trace->IsAvailable());
 
     // Proces should output expected Trace results to MockOutputter
     trace->Process();
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu