| Index: gpu/command_buffer/service/gpu_service_test.cc
|
| diff --git a/gpu/command_buffer/service/gpu_service_test.cc b/gpu/command_buffer/service/gpu_service_test.cc
|
| index a51a54c7a4879a2ff14e0cd722b74100009a6f9e..8d62b5ab5e554045a8bdb093ad5904260ee2e8ff 100644
|
| --- a/gpu/command_buffer/service/gpu_service_test.cc
|
| +++ b/gpu/command_buffer/service/gpu_service_test.cc
|
| @@ -21,7 +21,8 @@ GpuServiceTest::~GpuServiceTest() {
|
| DCHECK(ran_teardown_);
|
| }
|
|
|
| -void GpuServiceTest::SetUp() {
|
| +void GpuServiceTest::SetUpWithGLVersion(const char* gl_version,
|
| + const char* gl_extensions) {
|
| testing::Test::SetUp();
|
|
|
| gfx::SetGLGetProcAddressProc(gfx::MockGLInterface::GetGLProcAddress);
|
| @@ -30,12 +31,16 @@ void GpuServiceTest::SetUp() {
|
| ::gfx::MockGLInterface::SetGLInterface(gl_.get());
|
|
|
| context_ = new gfx::GLContextStubWithExtensions;
|
| - context_->AddExtensionsString(NULL);
|
| - context_->SetGLVersionString("3.0");
|
| + context_->AddExtensionsString(gl_extensions);
|
| + context_->SetGLVersionString(gl_version);
|
| gfx::GLSurface::InitializeDynamicMockBindingsForTests(context_);
|
| ran_setup_ = true;
|
| }
|
|
|
| +void GpuServiceTest::SetUp() {
|
| + SetUpWithGLVersion("2.0", NULL);
|
| +}
|
| +
|
| void GpuServiceTest::TearDown() {
|
| DCHECK(ran_setup_);
|
| ::gfx::MockGLInterface::SetGLInterface(NULL);
|
|
|