Revert of gpu: Add base class for gpu service tests

gpu/command_buffer/service/query_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/query_manager.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
 #include "gpu/command_buffer/service/error_state_mock.h"
-#include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
-#include "gpu/command_buffer/service/gpu_service_test.h"
+#include "gpu/command_buffer/service/feature_info.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::InSequence;
 using ::testing::Return;
 using ::testing::SetArgumentPointee;
 
 namespace gpu {
 namespace gles2 {
 
-class QueryManagerTest : public GpuServiceTest {
+class QueryManagerTest : public testing::Test {
  public:
   static const int32 kSharedMemoryId = 401;
   static const size_t kSharedBufferSize = 2048;
   static const uint32 kSharedMemoryOffset = 132;
   static const int32 kInvalidSharedMemoryId = 402;
   static const uint32 kInvalidSharedMemoryOffset = kSharedBufferSize + 1;
   static const uint32 kInitialResult = 0xBDBDBDBDu;
   static const uint8 kInitialMemoryValue = 0xBDu;
 
   QueryManagerTest() {
   }
   virtual ~QueryManagerTest() {
   }
 
  protected:
   virtual void SetUp() {
-    GpuServiceTest::SetUp();
+    gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>());
+    ::gfx::MockGLInterface::SetGLInterface(gl_.get());
     engine_.reset(new MockCommandBufferEngine());
     decoder_.reset(new MockGLES2Decoder());
     decoder_->set_engine(engine_.get());
     TestHelper::SetupFeatureInfoInitExpectations(
         gl_.get(),
         "GL_EXT_occlusion_query_boolean");
     scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
     feature_info->Initialize();
     manager_.reset(new QueryManager(decoder_.get(), feature_info.get()));
   }
 
   virtual void TearDown() {
     decoder_.reset();
     manager_->Destroy(false);
     manager_.reset();
     engine_.reset();
-    GpuServiceTest::TearDown();
+    ::gfx::MockGLInterface::SetGLInterface(NULL);
+    gl_.reset();
   }
 
   QueryManager::Query* CreateQuery(
       GLenum target, GLuint client_id, int32 shm_id, uint32 shm_offset,
       GLuint service_id) {
     EXPECT_CALL(*gl_, GenQueriesARB(1, _))
        .WillOnce(SetArgumentPointee<1>(service_id))
        .RetiresOnSaturation();
     return manager_->CreateQuery(target, client_id, shm_id, shm_offset);
   }
 
   void QueueQuery(QueryManager::Query* query,
                   GLuint service_id,
                   base::subtle::Atomic32 submit_count) {
     EXPECT_CALL(*gl_, BeginQueryARB(query->target(), service_id))
         .Times(1)
         .RetiresOnSaturation();
     EXPECT_CALL(*gl_, EndQueryARB(query->target()))
         .Times(1)
         .RetiresOnSaturation();
     EXPECT_TRUE(manager_->BeginQuery(query));
     EXPECT_TRUE(manager_->EndQuery(query, submit_count));
   }
 
+  // Use StrictMock to make 100% sure we know how GL will be called.
+  scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_;
   scoped_ptr<MockGLES2Decoder> decoder_;
   scoped_ptr<QueryManager> manager_;
 
  private:
   class MockCommandBufferEngine : public CommandBufferEngine {
    public:
     MockCommandBufferEngine() {
       scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory());
       shared_memory->CreateAndMapAnonymous(kSharedBufferSize);
       valid_buffer_ =
@@ skipping 472 matching lines @@
 
   EXPECT_EQ(static_cast<GLuint>(GL_INVALID_ENUM), sync->result);
 
   manager->Destroy(false);
 }
 
 }  // namespace gles2
 }  // namespace gpu