Index: content/test/content_test_suite.cc |
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc |
index 116bd0ce472064bf8445bc610e3bafd172f4f860..3e6ad603b20af2afcbda92801d7df5cdd8a1711e 100644 |
--- a/content/test/content_test_suite.cc |
+++ b/content/test/content_test_suite.cc |
@@ -78,6 +78,16 @@ void ContentTestSuite::Initialize() { |
#if defined(OS_WIN) |
gfx::InitDeviceScaleFactor(1.0f); |
#endif |
+#if !defined(OS_IOS) |
+ bool is_child_process = base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kTestChildProcess); |
+#endif |
+#if defined(USE_OZONE) |
+ if (!is_child_process) { |
+ ozone_ = ui::OzoneInitializerForTest::Create(); |
+ DCHECK(ozone_); |
+ } |
+#endif |
ContentTestSuiteBase::Initialize(); |
{ |
@@ -89,8 +99,7 @@ void ContentTestSuite::Initialize() { |
media::InitializeMediaLibrary(); |
// When running in a child process for Mac sandbox tests, the sandbox exists |
// to initialize GL, so don't do it here. |
- if (!base::CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kTestChildProcess)) { |
+ if (!is_child_process) { |
gfx::GLSurface::InitializeOneOffForTests(); |
gpu::ApplyGpuDriverBugWorkarounds(base::CommandLine::ForCurrentProcess()); |
} |