services/ui: Split GpuServiceInternal into gpu vs. ws pieces.

services/ui/service.cc

Index: services/ui/service.cc
diff --git a/services/ui/service.cc b/services/ui/service.cc
index c58d1b8abe4391bb13f708d91f1afe8c3954220b..416850424bd5612dfc4d633ca5bf9459fa612339 100644
--- a/services/ui/service.cc
+++ b/services/ui/service.cc
@@ -178,8 +178,6 @@ void Service::OnStart(const shell::Identity& identity) {
   // so keep this line below both of those.
   input_device_server_.RegisterAsObserver();
 
-  gpu_proxy_.reset(new GpuServiceProxy());
-
   // Gpu must be running before the PlatformScreen can be initialized.
   window_server_.reset(new ws::WindowServer(this));
 
@@ -285,7 +283,7 @@ void Service::Create(const shell::Identity& remote_identity,
 
 void Service::Create(const shell::Identity& remote_identity,
                      mojom::GpuServiceRequest request) {
-  gpu_proxy_->Add(std::move(request));
+  window_server_->gpu_proxy()->Add(std::move(request));
 }
 
 void Service::Create(const shell::Identity& remote_identity,