Index: content/common/gpu/media/video_decode_accelerator_unittest.cc |
diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc |
index c501bde839a3bc6a83d6617ffc1ad9ba0713b907..5a7fe5d6f0bc7941205c6a133e4faaa3935896f2 100644 |
--- a/content/common/gpu/media/video_decode_accelerator_unittest.cc |
+++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc |
@@ -871,11 +871,13 @@ void VideoDecodeAcceleratorTest::SetUp() { |
// Initialize the rendering thread. |
base::Thread::Options options; |
options.message_loop_type = base::MessageLoop::TYPE_DEFAULT; |
-#if defined(OS_WIN) |
+#if defined(OS_WIN) || defined(USE_OZONE) |
// For windows the decoding thread initializes the media foundation decoder |
// which uses COM. We need the thread to be a UI thread. |
+ // On Ozone, the backend initializes the event system using a UI |
+ // thread. |
options.message_loop_type = base::MessageLoop::TYPE_UI; |
-#endif // OS_WIN |
+#endif // OS_WIN || USE_OZONE |
rendering_thread_.StartWithOptions(options); |
rendering_loop_proxy_ = rendering_thread_.message_loop_proxy(); |
@@ -1451,6 +1453,8 @@ int main(int argc, char **argv) { |
} |
if (it->first == "v" || it->first == "vmodule") |
continue; |
+ if (it->first == "ozone-platform" || it->first == "ozone-use-surfaceless") |
+ continue; |
LOG(FATAL) << "Unexpected switch: " << it->first << ":" << it->second; |
} |