Move Ozone GPU initialization.

ui/gl/test/gl_surface_test_support.cc

 // Copyright 2015 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 "ui/gl/test/gl_surface_test_support.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 14 matching lines @@
 
 namespace gl {
 
 // static
 void GLSurfaceTestSupport::InitializeOneOff() {
   DCHECK_EQ(kGLImplementationNone, GetGLImplementation());
 
 #if defined(USE_X11)
   XInitThreads();
 #endif
+
+#if defined(USE_OZONE)
+  ui::OzonePlatform::InitParams params;
+  params.single_process = true;
+  ui::OzonePlatform::InitializeForGPU(params);
+#endif
+
   ui::test::EnableTestConfigForPlatformWindows();
 
   bool use_software_gl = true;
 
   // We usually use software GL as this works on all bots. The
   // command line can override this behaviour to use hardware GL.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseGpuInTests)) {
     use_software_gl = false;
   }
@@ skipping 36 matching lines @@
   bool gpu_service_logging = false;
   bool disable_gl_drawing = false;
 
   CHECK(init::InitializeGLOneOffImplementation(
       impl, fallback_to_software_gl, gpu_service_logging, disable_gl_drawing));
 }
 
 // static
 void GLSurfaceTestSupport::InitializeOneOffWithMockBindings() {
 #if defined(USE_OZONE)
-  // This function skips where Ozone is otherwise initialized.
-  ui::OzonePlatform::InitializeForGPU();
+  ui::OzonePlatform::InitParams params;
+  params.single_process = true;
+  ui::OzonePlatform::InitializeForGPU(params);
 #endif
+
   InitializeOneOffImplementation(kGLImplementationMockGL, false);
 }
 
 void GLSurfaceTestSupport::InitializeOneOffWithStubBindings() {
 #if defined(USE_OZONE)
-  // This function skips where Ozone is otherwise initialized.
-  ui::OzonePlatform::InitializeForGPU();
+  ui::OzonePlatform::InitParams params;
+  params.single_process = true;
+  ui::OzonePlatform::InitializeForGPU(params);
 #endif
+
   InitializeOneOffImplementation(kGLImplementationStubGL, false);
 }
 
 }  // namespace gl