Move Ozone GPU initialization.

gpu/ipc/service/gpu_init.cc

Index: gpu/ipc/service/gpu_init.cc
diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
index 8ed804264d88d94cdba97ca0541e1bc0b5921360..af5fb220275ea0949fc1a82406a99792e722839a 100644
--- a/gpu/ipc/service/gpu_init.cc
+++ b/gpu/ipc/service/gpu_init.cc
@@ -22,6 +22,10 @@
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/init/gl_factory.h"
 
+#if defined(USE_OZONE)
+#include "ui/ozone/public/ozone_platform.h"
+#endif
+
 namespace gpu {
 
 namespace {
@@ -175,6 +179,14 @@ bool GpuInit::InitializeAndStartSandbox(const base::CommandLine& command_line) {
 
   base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
 
+#if defined(USE_OZONE)
+  // Initialize Ozone GPU after the watchdog in case it hangs. The sandbox
+  // may also have started at this point.
+  ui::OzonePlatform::InitParams params;
+  params.single_process = false;
+  ui::OzonePlatform::InitializeForGPU(params);
+#endif
+
   // Load and initialize the GL implementation and locate the GL entry points if
   // needed. This initialization may have already happened if running in the
   // browser process, for example.