Revert 278059 "gpu: Add base class for gpu service tests"

trunk/src/gpu/command_buffer/service/renderbuffer_manager_unittest.cc

Index: trunk/src/gpu/command_buffer/service/renderbuffer_manager_unittest.cc
===================================================================
--- trunk/src/gpu/command_buffer/service/renderbuffer_manager_unittest.cc	(revision 278063)
+++ trunk/src/gpu/command_buffer/service/renderbuffer_manager_unittest.cc	(working copy)
@@ -6,7 +6,6 @@
 
 #include <set>
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
-#include "gpu/command_buffer/service/gpu_service_test.h"
 #include "gpu/command_buffer/service/mocks.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_implementation.h"
@@ -17,14 +16,15 @@
 namespace gpu {
 namespace gles2 {
 
-class RenderbufferManagerTestBase : public GpuServiceTest {
+class RenderbufferManagerTestBase : public testing::Test {
  public:
   static const GLint kMaxSize = 128;
   static const GLint kMaxSamples = 4;
 
  protected:
   void SetUpBase(MemoryTracker* memory_tracker, bool depth24_supported) {
-    GpuServiceTest::SetUp();
+    gl_.reset(new ::testing::StrictMock<gfx::MockGLInterface>());
+    ::gfx::MockGLInterface::SetGLInterface(gl_.get());
     manager_.reset(new RenderbufferManager(
         memory_tracker, kMaxSize, kMaxSamples, depth24_supported));
   }
@@ -32,9 +32,12 @@
   virtual void TearDown() {
     manager_->Destroy(true);
     manager_.reset();
-    GpuServiceTest::TearDown();
+    ::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_ptr<RenderbufferManager> manager_;
 };