Revert of gpu: Add base class for gpu service tests

gpu/command_buffer/service/query_manager_unittest.cc

Index: gpu/command_buffer/service/query_manager_unittest.cc
diff --git a/gpu/command_buffer/service/query_manager_unittest.cc b/gpu/command_buffer/service/query_manager_unittest.cc
index 9f0156f791a9f48c746a323ede26bc539e153f67..0acbbece1dacb5063b5314b7776cd069bef57e83 100644
--- a/gpu/command_buffer/service/query_manager_unittest.cc
+++ b/gpu/command_buffer/service/query_manager_unittest.cc
@@ -6,10 +6,9 @@
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
 #include "gpu/command_buffer/service/error_state_mock.h"
-#include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
-#include "gpu/command_buffer/service/gpu_service_test.h"
+#include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_mock.h"
@@ -22,7 +21,7 @@
 namespace gpu {
 namespace gles2 {
 
-class QueryManagerTest : public GpuServiceTest {
+class QueryManagerTest : public testing::Test {
  public:
   static const int32 kSharedMemoryId = 401;
   static const size_t kSharedBufferSize = 2048;
@@ -39,7 +38,8 @@
 
  protected:
   virtual void SetUp() {
-    GpuServiceTest::SetUp();
+    gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>());
+    ::gfx::MockGLInterface::SetGLInterface(gl_.get());
     engine_.reset(new MockCommandBufferEngine());
     decoder_.reset(new MockGLES2Decoder());
     decoder_->set_engine(engine_.get());
@@ -56,7 +56,8 @@
     manager_->Destroy(false);
     manager_.reset();
     engine_.reset();
-    GpuServiceTest::TearDown();
+    ::gfx::MockGLInterface::SetGLInterface(NULL);
+    gl_.reset();
   }
 
   QueryManager::Query* CreateQuery(
@@ -81,6 +82,8 @@
     EXPECT_TRUE(manager_->EndQuery(query, submit_count));
   }
 
+  // Use StrictMock to make 100% sure we know how GL will be called.
+  scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_;
   scoped_ptr<MockGLES2Decoder> decoder_;
   scoped_ptr<QueryManager> manager_;