Fix GPU service and display initialization race.

services/ui/service.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/service.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 175 matching lines @@
 
   // Gpu must be running before the PlatformScreen can be initialized.
   window_server_.reset(new ws::WindowServer(this));
 
   // DeviceDataManager must be initialized before TouchController. On non-Linux
   // platforms there is no DeviceDataManager so don't create touch controller.
   if (ui::DeviceDataManager::HasInstance())
     touch_controller_.reset(
         new ws::TouchController(window_server_->display_manager()));
 
-  platform_screen_->Init(window_server_->display_manager());
-
   ime_server_.Init(context()->connector());
 }
 
 bool Service::OnConnect(const service_manager::ServiceInfo& remote_info,
                         service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::AccessibilityManager>(this);
   registry->AddInterface<mojom::Clipboard>(this);
   registry->AddInterface<mojom::DisplayManager>(this);
   registry->AddInterface<mojom::GpuService>(this);
   registry->AddInterface<mojom::IMERegistrar>(this);
@@ skipping 13 matching lines @@
 
   platform_screen_->AddInterfaces(registry);
 
 #if defined(USE_OZONE)
   ui::OzonePlatform::GetInstance()->AddInterfaces(registry);
 #endif
 
   return true;
 }
 
+void Service::StartDisplayInit() {
+  platform_screen_->Init(window_server_->display_manager());
+}
+
 void Service::OnFirstDisplayReady() {
   PendingRequests requests;
   requests.swap(pending_requests_);
   for (auto& request : requests) {
     if (request->wtf_request)
       Create(request->remote_identity, std::move(*request->wtf_request));
     else
       Create(request->remote_identity, std::move(*request->dm_request));
   }
 }
@@ skipping 117 matching lines @@
                      mojom::WindowServerTestRequest request) {
   if (!test_config_)
     return;
   mojo::MakeStrongBinding(
       base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()),
       std::move(request));
 }
 
 
 }  // namespace ui