Revert of gpu: Add base class for gpu service tests

gpu/command_buffer/service/vertex_attrib_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/vertex_attrib_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #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/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_mock.h"
 
 using ::testing::Pointee;
 using ::testing::_;
 
 namespace gpu {
 namespace gles2 {
 
-class VertexAttribManagerTest : public GpuServiceTest {
+class VertexAttribManagerTest : public testing::Test {
  public:
   static const uint32 kNumVertexAttribs = 8;
 
   VertexAttribManagerTest() {
   }
 
   virtual ~VertexAttribManagerTest() {
   }
 
  protected:
   virtual void SetUp() {
-    GpuServiceTest::SetUp();
+    gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>());
+    ::gfx::MockGLInterface::SetGLInterface(gl_.get());
 
     for (uint32 ii = 0; ii < kNumVertexAttribs; ++ii) {
       EXPECT_CALL(*gl_, VertexAttrib4f(ii, 0.0f, 0.0f, 0.0f, 1.0f))
           .Times(1)
           .RetiresOnSaturation();
     }
 
     manager_ = new VertexAttribManager();
     manager_->Initialize(kNumVertexAttribs, true);
   }
 
+  virtual void TearDown() {
+    manager_ = NULL;
+    ::gfx::MockGLInterface::SetGLInterface(NULL);
+    gl_.reset();
+  }
+
+  // Use StrictMock to make 100% sure we know how GL will be called.
+  scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_;
   scoped_refptr<VertexAttribManager> manager_;
 };
 
 // GCC requires these declarations, but MSVC requires they not be present
 #ifndef COMPILER_MSVC
 const uint32 VertexAttribManagerTest::kNumVertexAttribs;
 #endif
 
 TEST_F(VertexAttribManagerTest, Basic) {
   EXPECT_TRUE(manager_->GetVertexAttrib(kNumVertexAttribs) == NULL);
@@ skipping 160 matching lines @@
   buffer_manager.Destroy(false);
 }
 
 // TODO(gman): Test ValidateBindings
 // TODO(gman): Test ValidateBindings with client side arrays.
 
 }  // namespace gles2
 }  // namespace gpu