services/ui: Remove unwanted gpu dependency from services/ui/surfaces.

services/ui/surfaces/surfaces_context_provider.cc

 // Copyright 2014 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 "services/ui/surfaces/surfaces_context_provider.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/shared_memory_limits.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
+#include "gpu/ipc/client/gpu_channel_host.h"
 #include "services/ui/common/switches.h"
-#include "services/ui/gpu/gpu_service_internal.h"
 #include "services/ui/surfaces/surfaces_context_provider_delegate.h"
 #include "ui/gl/gpu_preference.h"
+#include "url/gurl.h"
 
 namespace ui {
 
-SurfacesContextProvider::SurfacesContextProvider(gfx::AcceleratedWidget widget)
+SurfacesContextProvider::SurfacesContextProvider(
+    gfx::AcceleratedWidget widget,
+    scoped_refptr<gpu::GpuChannelHost> gpu_channel)
     : delegate_(nullptr), widget_(widget) {
-  GpuServiceInternal* service = GpuServiceInternal::GetInstance();
   gpu::CommandBufferProxyImpl* shared_command_buffer = nullptr;
   gpu::GpuStreamId stream_id = gpu::GpuStreamId::GPU_STREAM_DEFAULT;
   gpu::GpuStreamPriority stream_priority = gpu::GpuStreamPriority::NORMAL;
   gpu::gles2::ContextCreationAttribHelper attributes;
   attributes.alpha_size = -1;
   attributes.depth_size = 0;
   attributes.stencil_size = 0;
   attributes.samples = 0;
   attributes.sample_buffers = 0;
   attributes.bind_generates_resource = false;
   attributes.lose_context_when_out_of_memory = true;
   GURL active_url;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner =
       base::ThreadTaskRunnerHandle::Get();
   command_buffer_proxy_impl_ = gpu::CommandBufferProxyImpl::Create(
-      service->gpu_channel_local(), widget, shared_command_buffer, stream_id,
+      std::move(gpu_channel), widget, shared_command_buffer, stream_id,
       stream_priority, attributes, active_url, task_runner);
+  CHECK(command_buffer_proxy_impl_);
   command_buffer_proxy_impl_->SetSwapBuffersCompletionCallback(
       base::Bind(&SurfacesContextProvider::OnGpuSwapBuffersCompleted,
                  base::Unretained(this)));
   command_buffer_proxy_impl_->SetUpdateVSyncParametersCallback(
       base::Bind(&SurfacesContextProvider::OnUpdateVSyncParameters,
                  base::Unretained(this)));
 }
 
 void SurfacesContextProvider::SetDelegate(
     SurfacesContextProviderDelegate* delegate) {
@@ skipping 92 matching lines @@
   if (delegate_)
     delegate_->OnVSyncParametersUpdated(timebase, interval);
 }
 
 void SurfacesContextProvider::SetSwapBuffersCompletionCallback(
     gl::GLSurface::SwapCompletionCallback callback) {
   swap_buffers_completion_callback_ = callback;
 }
 
 }  // namespace ui