Revert of gpu: Add base class for gpu service tests

gpu/command_buffer/service/buffer_manager_unittest.cc

Index: gpu/command_buffer/service/buffer_manager_unittest.cc
diff --git a/gpu/command_buffer/service/buffer_manager_unittest.cc b/gpu/command_buffer/service/buffer_manager_unittest.cc
index 77f32dcc416549e73959e285d9b00f5f5dcfd9b5..4d222b03179a9ca272580bbde27f5754c5d7090c 100644
--- a/gpu/command_buffer/service/buffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/buffer_manager_unittest.cc
@@ -5,7 +5,6 @@
 #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/mocks.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -18,13 +17,14 @@
 namespace gpu {
 namespace gles2 {
 
-class BufferManagerTestBase : public GpuServiceTest {
+class BufferManagerTestBase : public testing::Test {
  protected:
   void SetUpBase(
       MemoryTracker* memory_tracker,
       FeatureInfo* feature_info,
       const char* extensions) {
-    GpuServiceTest::SetUp();
+    gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>());
+    ::gfx::MockGLInterface::SetGLInterface(gl_.get());
     if (feature_info) {
       TestHelper::SetupFeatureInfoInitExpectations(gl_.get(), extensions);
       feature_info->Initialize();
@@ -36,8 +36,9 @@
   virtual void TearDown() {
     manager_->Destroy(false);
     manager_.reset();
+    ::gfx::MockGLInterface::SetGLInterface(NULL);
     error_state_.reset();
-    GpuServiceTest::TearDown();
+    gl_.reset();
   }
 
   GLenum GetTarget(const Buffer* buffer) const {
@@ -72,6 +73,8 @@
     return success;
   }
 
+  // Use StrictMock to make 100% sure we know how GL will be called.
+  scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_;
   scoped_ptr<BufferManager> manager_;
   scoped_ptr<MockErrorState> error_state_;
 };