| Index: gpu/gles2_conform_support/egl/display.cc
 | 
| diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc
 | 
| index 9885cd69286e8525f672b2d87e05450ceb17db21..ae13eece4088beca9f6938fa1fda193f7e054e2d 100644
 | 
| --- a/gpu/gles2_conform_support/egl/display.cc
 | 
| +++ b/gpu/gles2_conform_support/egl/display.cc
 | 
| @@ -171,7 +171,7 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config,
 | 
|    }
 | 
|  
 | 
|    gpu_control_.reset(new gpu::GpuControlService(
 | 
| -      NULL, NULL, group->mailbox_manager(), NULL, decoder_->GetCapabilities()));
 | 
| +      NULL, NULL, group->mailbox_manager(), NULL));
 | 
|  
 | 
|    command_buffer->SetPutOffsetChangeCallback(
 | 
|        base::Bind(&gpu::GpuScheduler::PutChanged,
 | 
| @@ -235,7 +235,8 @@ EGLContext Display::CreateContext(EGLConfig config,
 | 
|        NULL,
 | 
|        transfer_buffer_.get(),
 | 
|        bind_generates_resources,
 | 
| -      gpu_control_.get()));
 | 
| +      gpu_control_.get(),
 | 
| +      decoder_->GetCapabilities()));
 | 
|  
 | 
|    if (!context_->Initialize(
 | 
|        kTransferBufferSize,
 | 
| 
 |