Revert of gpu: Add base class for gpu service tests

gpu/command_buffer/service/mailbox_manager_unittest.cc

 // Copyright 2013 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/mailbox_manager.h"
 
 #include "gpu/command_buffer/service/feature_info.h"
-#include "gpu/command_buffer/service/gpu_service_test.h"
 #include "gpu/command_buffer/service/mailbox_synchronizer.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_context_stub.h"
 #include "ui/gl/gl_mock.h"
 #include "ui/gl/gl_surface_stub.h"
 
 namespace gpu {
 namespace gles2 {
 
 using namespace ::testing;
 
-class MailboxManagerTest : public GpuServiceTest {
+class MailboxManagerTest : public testing::Test {
  public:
-  MailboxManagerTest() : initialized_synchronizer_(false) {}
+  MailboxManagerTest() {}
   virtual ~MailboxManagerTest() {}
 
  protected:
   virtual void SetUp() {
-    GpuServiceTest::SetUp();
+    testing::Test::SetUp();
     feature_info_ = new FeatureInfo;
     manager_ = new MailboxManager;
   }
 
-  virtual void SetUpWithSynchronizer() {
-    GpuServiceTest::SetUp();
-    MailboxSynchronizer::Initialize();
-    initialized_synchronizer_ = true;
-    feature_info_ = new FeatureInfo;
-    manager_ = new MailboxManager;
-  }
-
-  virtual void TearDown() {
-    if (initialized_synchronizer_)
-      MailboxSynchronizer::Terminate();
-    GpuServiceTest::TearDown();
-  }
-
   Texture* CreateTexture() {
     return new Texture(1);
   }
 
   void SetTarget(Texture* texture, GLenum target, GLuint max_level) {
     texture->SetTarget(NULL, target, max_level);
   }
 
   void SetLevelInfo(
       Texture* texture,
@@ skipping 24 matching lines @@
     return texture->SetParameteri(feature_info_, pname, param);
   }
 
   void DestroyTexture(Texture* texture) {
     delete texture;
   }
 
   scoped_refptr<MailboxManager> manager_;
 
  private:
-  bool initialized_synchronizer_;
   scoped_refptr<FeatureInfo> feature_info_;
 
   DISALLOW_COPY_AND_ASSIGN(MailboxManagerTest);
 };
 
 // Tests basic produce/consume behavior.
 TEST_F(MailboxManagerTest, Basic) {
   Texture* texture = CreateTexture();
 
   Mailbox name = Mailbox::Generate();
@@ skipping 92 matching lines @@
 const GLsizei kMaxTextureHeight = 64;
 const GLsizei kMaxTextureDepth = 1;
 
 class MailboxManagerSyncTest : public MailboxManagerTest {
  public:
   MailboxManagerSyncTest() {}
   virtual ~MailboxManagerSyncTest() {}
 
  protected:
   virtual void SetUp() {
-    MailboxManagerTest::SetUpWithSynchronizer();
+    MailboxSynchronizer::Initialize();
+    MailboxManagerTest::SetUp();
     manager2_ = new MailboxManager;
+    gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>());
+    ::gfx::MockGLInterface::SetGLInterface(gl_.get());
     context_ = new gfx::GLContextStub();
     surface_ = new gfx::GLSurfaceStub();
     context_->MakeCurrent(surface_);
   }
 
   Texture* DefineTexture() {
     Texture* texture = CreateTexture();
     const GLsizei levels_needed = TextureManager::ComputeMipMapCount(
         GL_TEXTURE_2D, kMaxTextureWidth, kMaxTextureHeight, kMaxTextureDepth);
     SetTarget(texture, GL_TEXTURE_2D, levels_needed);
@@ skipping 42 matching lines @@
         .RetiresOnSaturation();
     EXPECT_CALL(*gl_, Flush())
         .Times(1)
         .RetiresOnSaturation();
     EXPECT_CALL(*gl_, BindTexture(GL_TEXTURE_2D, kCurrentTexture))
         .Times(1)
         .RetiresOnSaturation();
   }
 
   virtual void TearDown() {
+    MailboxManagerTest::TearDown();
+    MailboxSynchronizer::Terminate();
     context_->ReleaseCurrent(NULL);
-    MailboxManagerTest::TearDown();
+    ::gfx::MockGLInterface::SetGLInterface(NULL);
+    gl_.reset();
   }
 
+  scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_;
   scoped_refptr<MailboxManager> manager2_;
   scoped_refptr<gfx::GLContext> context_;
   scoped_refptr<gfx::GLSurface> surface_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MailboxManagerSyncTest);
 };
 
 TEST_F(MailboxManagerSyncTest, ProduceDestroy) {
   Texture* texture = DefineTexture();
@@ skipping 188 matching lines @@
 // TODO: same texture, multiple mailboxes
 
 // TODO: Produce incomplete texture
 
 // TODO: Texture::level_infos_[][].size()
 
 // TODO: unsupported targets and formats
 
 }  // namespace gles2
 }  // namespace gpu