| Index: gpu/command_buffer/service/gpu_control_service.cc
 | 
| diff --git a/gpu/command_buffer/service/gpu_control_service.cc b/gpu/command_buffer/service/gpu_control_service.cc
 | 
| index 893b872c0c7cab8c6438cb458fd7081d5516a982..cd36b01e882b3970f6316bb795db5301a564a6cf 100644
 | 
| --- a/gpu/command_buffer/service/gpu_control_service.cc
 | 
| +++ b/gpu/command_buffer/service/gpu_control_service.cc
 | 
| @@ -15,24 +15,16 @@ GpuControlService::GpuControlService(
 | 
|      GpuMemoryBufferManagerInterface* gpu_memory_buffer_manager,
 | 
|      GpuMemoryBufferFactory* gpu_memory_buffer_factory,
 | 
|      gles2::MailboxManager* mailbox_manager,
 | 
| -    gles2::QueryManager* query_manager,
 | 
| -    const gpu::Capabilities& decoder_capabilities)
 | 
| +    gles2::QueryManager* query_manager)
 | 
|      : gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
 | 
|        gpu_memory_buffer_factory_(gpu_memory_buffer_factory),
 | 
|        mailbox_manager_(mailbox_manager),
 | 
| -      query_manager_(query_manager),
 | 
| -      capabilities_(decoder_capabilities) {
 | 
| -  capabilities_.map_image =
 | 
| -      gpu_memory_buffer_manager_ && gpu_memory_buffer_factory_;
 | 
| +      query_manager_(query_manager) {
 | 
|  }
 | 
|  
 | 
|  GpuControlService::~GpuControlService() {
 | 
|  }
 | 
|  
 | 
| -gpu::Capabilities GpuControlService::GetCapabilities() {
 | 
| -  return capabilities_;
 | 
| -}
 | 
| -
 | 
|  gfx::GpuMemoryBuffer* GpuControlService::CreateGpuMemoryBuffer(
 | 
|      size_t width,
 | 
|      size_t height,
 | 
| @@ -40,7 +32,7 @@ gfx::GpuMemoryBuffer* GpuControlService::CreateGpuMemoryBuffer(
 | 
|      int32* id) {
 | 
|    *id = -1;
 | 
|  
 | 
| -  CHECK(gpu_memory_buffer_factory_) << "No GPU memory buffer factory provided";
 | 
| +  DCHECK(gpu_memory_buffer_factory_);
 | 
|    linked_ptr<gfx::GpuMemoryBuffer> buffer = make_linked_ptr(
 | 
|        gpu_memory_buffer_factory_->CreateGpuMemoryBuffer(width,
 | 
|                                                          height,
 | 
| @@ -116,6 +108,7 @@ bool GpuControlService::RegisterGpuMemoryBuffer(
 | 
|      size_t width,
 | 
|      size_t height,
 | 
|      unsigned internalformat) {
 | 
| +  DCHECK(gpu_memory_buffer_manager_);
 | 
|    return gpu_memory_buffer_manager_->RegisterGpuMemoryBuffer(id,
 | 
|                                                               buffer,
 | 
|                                                               width,
 | 
| 
 |