Revert of gpu: Add base class for gpu service tests

gpu/command_buffer/service/buffer_manager_unittest.cc

 // Copyright (c) 2012 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 "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"
 #include "ui/gl/gl_mock.h"
 
 using ::testing::_;
 using ::testing::Return;
 using ::testing::StrictMock;
 
 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();
     }
     error_state_.reset(new MockErrorState());
     manager_.reset(new BufferManager(memory_tracker, feature_info));
   }
 
   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 {
     return buffer->target();
   }
 
   void DoBufferData(
       Buffer* buffer, GLsizeiptr size, GLenum usage, const GLvoid* data,
       GLenum error) {
     TestHelper::DoBufferData(
@@ skipping 14 matching lines @@
       EXPECT_CALL(*gl_, BufferSubData(
           buffer->target(), offset, size, _))
           .Times(1)
           .RetiresOnSaturation();
     }
     manager_->DoBufferSubData(
         error_state_.get(), buffer, offset, size, data);
     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_;
 };
 
 class BufferManagerTest : public BufferManagerTestBase {
  protected:
   virtual void SetUp() {
     SetUpBase(NULL, NULL, "");
   }
 };
@@ skipping 329 matching lines @@
   DoBufferData(buffer, sizeof(data3), GL_STATIC_DRAW, data3, GL_NO_ERROR);
   EXPECT_TRUE(
       buffer->GetMaxValueForRange(0, 3, GL_UNSIGNED_INT, &max_value));
   EXPECT_EQ(30u, max_value);
 }
 
 }  // namespace gles2
 }  // namespace gpu