Index: gpu/command_buffer/service/memory_program_cache_unittest.cc |
diff --git a/gpu/command_buffer/service/memory_program_cache_unittest.cc b/gpu/command_buffer/service/memory_program_cache_unittest.cc |
index 6973e67afe433c7c44a77fbd8ff4f27235562a51..2db0df5346ba2d8ea694dfe0433d05738767b345 100644 |
--- a/gpu/command_buffer/service/memory_program_cache_unittest.cc |
+++ b/gpu/command_buffer/service/memory_program_cache_unittest.cc |
@@ -7,7 +7,6 @@ |
#include "base/bind.h" |
#include "gpu/command_buffer/common/gles2_cmd_format.h" |
#include "gpu/command_buffer/service/gl_utils.h" |
-#include "gpu/command_buffer/service/gpu_service_test.h" |
#include "gpu/command_buffer/service/shader_manager.h" |
#include "gpu/command_buffer/service/shader_translator.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -66,7 +65,7 @@ |
const char* binary_; |
}; |
-class MemoryProgramCacheTest : public GpuServiceTest { |
+class MemoryProgramCacheTest : public testing::Test { |
public: |
static const size_t kCacheSizeBytes = 1024; |
static const GLuint kVertexShaderClientId = 90; |
@@ -93,7 +92,8 @@ |
protected: |
virtual void SetUp() { |
- GpuServiceTest::SetUp(); |
+ gl_.reset(new ::testing::StrictMock<gfx::MockGLInterface>()); |
+ ::gfx::MockGLInterface::SetGLInterface(gl_.get()); |
vertex_shader_ = shader_manager_.CreateShader(kVertexShaderClientId, |
kVertexShaderServiceId, |
@@ -137,6 +137,11 @@ |
fragment_shader_->SetStatus(true, NULL, NULL); |
} |
+ virtual void TearDown() { |
+ ::gfx::MockGLInterface::SetGLInterface(NULL); |
+ gl_.reset(); |
+ } |
+ |
void SetExpectationsForSaveLinkedProgram( |
const GLint program_id, |
ProgramBinaryEmulator* emulator) const { |
@@ -176,6 +181,8 @@ |
.WillOnce(SetArgPointee<2>(GL_FALSE)); |
} |
+ // Use StrictMock to make 100% sure we know how GL will be called. |
+ scoped_ptr< ::testing::StrictMock<gfx::MockGLInterface> > gl_; |
scoped_ptr<MemoryProgramCache> cache_; |
ShaderManager shader_manager_; |
Shader* vertex_shader_; |