services/ui: Use new gpu::GpuInit to do the GPU initialization.

services/ui/ws/gpu_service_proxy.cc

Index: services/ui/ws/gpu_service_proxy.cc
diff --git a/services/ui/ws/gpu_service_proxy.cc b/services/ui/ws/gpu_service_proxy.cc
index e1a62d3ff2ee230a3ec2568fb7af87c5f3ec1021..e5b993d55072b80b3347152cd87239df51c06d2b 100644
--- a/services/ui/ws/gpu_service_proxy.cc
+++ b/services/ui/ws/gpu_service_proxy.cc
@@ -10,7 +10,6 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "services/shell/public/cpp/connection.h"
-#include "services/ui/gpu/gpu_service_internal.h"
 #include "services/ui/ws/gpu_service_proxy_delegate.h"
 #include "services/ui/ws/mus_gpu_memory_buffer_manager.h"
 
@@ -32,7 +31,7 @@ GpuServiceProxy::GpuServiceProxy(GpuServiceProxyDelegate* delegate)
                       base::WaitableEvent::InitialState::NOT_SIGNALED) {
   // TODO(sad): Once GPU process is split, this would look like:
   //   connector->ConnectToInterface("mojo:gpu", &gpu_service_);
-  GpuServiceInternal::GetInstance()->Add(GetProxy(&gpu_service_));
+  gpu_main_.Add(GetProxy(&gpu_service_));
   gpu_service_->Initialize(
       base::Bind(&GpuServiceProxy::OnInitialized, base::Unretained(this)));
 }
@@ -62,7 +61,7 @@ void GpuServiceProxy::OnInternalGpuChannelEstablished(
   CHECK(io_thread_->StartWithOptions(thread_options));
 
   gpu_memory_buffer_manager_.reset(new MusGpuMemoryBufferManager(
-      GpuServiceInternal::GetInstance(), kInternalGpuChannelClientId));
+      gpu_main_.gpu_service(), kInternalGpuChannelClientId));
   gpu_channel_ = gpu::GpuChannelHost::Create(
       this, kInternalGpuChannelClientId, gpu_info_,
       IPC::ChannelHandle(channel_handle.release()), &shutdown_event_,