gpu: Separate GpuControlService from GpuControl

mojo/services/gles2/command_buffer_impl.cc

 // Copyright 2013 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 "mojo/services/gles2/command_buffer_impl.h"
 
 #include "base/bind.h"
 #include "base/memory/shared_memory.h"
 
 #include "gpu/command_buffer/common/constants.h"
@@ skipping 95 matching lines @@
   if (!decoder_->Initialize(surface,
                             context,
                             false /* offscreen */,
                             size_,
                             disallowed_features,
                             attrib_vector))
     return false;
 
   gpu_control_.reset(
       new gpu::GpuControlService(context_group->image_manager(),
-                                 NULL,
                                  context_group->mailbox_manager(),
-                                 NULL,
-                                 decoder_->GetCapabilities()));
+                                 NULL));
 
   command_buffer_->SetPutOffsetChangeCallback(base::Bind(
       &gpu::GpuScheduler::PutChanged, base::Unretained(scheduler_.get())));
   command_buffer_->SetGetBufferChangeCallback(base::Bind(
       &gpu::GpuScheduler::SetGetBuffer, base::Unretained(scheduler_.get())));
   command_buffer_->SetParseErrorCallback(
       base::Bind(&CommandBufferImpl::OnParseError, base::Unretained(this)));
 
   // TODO(piman): other callbacks
 
@@ skipping 55 matching lines @@
 
 void CommandBufferImpl::OnParseError() {
   gpu::CommandBuffer::State state = command_buffer_->GetState();
   client_->LostContext(state.context_lost_reason);
 }
 
 void CommandBufferImpl::DrawAnimationFrame() { client_->DrawAnimationFrame(); }
 
 }  // namespace services
 }  // namespace mojo