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..576f140fe23c6702bd4bac188bbfc8c6eebddb20 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,13 @@ 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 and sandbox are started.

[piman, 2017/03/15 19:48:21]

The sandbox is generally not started at this point (early sandbox is the
exception for a couple of drivers that create threads).
I think this is still ok (since it used to be in InitializeGLOneOff right
below), but you may want to update the comment to reflect what's really
happening.

[kylechar, 2017/03/15 20:59:08]

Thanks for the clarification, I changed the comment.

+  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.