gpu: media: RenderingHelper: wait for the display & window to be ready

content/common/gpu/media/video_decode_accelerator_unittest.cc

 // Copyright (c) 2012 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.
 //
 // The bulk of this file is support code; sorry about that.  Here's an overview
 // to hopefully help readers of this code:
 // - RenderingHelper is charged with interacting with X11/{EGL/GLES2,GLX/GL} or
 //   Win/EGL.
 // - ClientState is an enum for the state of the decode client used by the test.
 // - ClientStateNotification is a barrier abstraction that allows the test code
@@ skipping 938 matching lines @@
   base::ShadowingAtExitManager at_exit_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoDecodeAcceleratorTest);
 };
 
 VideoDecodeAcceleratorTest::VideoDecodeAcceleratorTest()
     : rendering_thread_("GLRenderingVDAClientThread") {}
 
 void VideoDecodeAcceleratorTest::SetUp() {
   ParseAndReadTestVideoData(g_test_video_data, &test_video_files_);
-
-  // Initialize the rendering thread.
-  base::Thread::Options options;
-  options.message_loop_type = base::MessageLoop::TYPE_DEFAULT;
-#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 || USE_OZONE
-
-  rendering_thread_.StartWithOptions(options);
+  rendering_thread_.Start();
   rendering_loop_proxy_ = rendering_thread_.message_loop_proxy();
 }
 
 void VideoDecodeAcceleratorTest::TearDown() {
   rendering_loop_proxy_->PostTask(
       FROM_HERE,
       base::Bind(&STLDeleteElements<std::vector<TestVideoFile*> >,
                  &test_video_files_));
 
   base::WaitableEvent done(false, false);
   rendering_loop_proxy_->PostTask(
       FROM_HERE,
       base::Bind(&RenderingHelper::UnInitialize,
                  base::Unretained(&rendering_helper_),
                  &done));
   done.Wait();
 
   rendering_thread_.Stop();
+  rendering_helper_.TearDown();
 }
 
 void VideoDecodeAcceleratorTest::ParseAndReadTestVideoData(
     base::FilePath::StringType data,
     std::vector<TestVideoFile*>* test_video_files) {
   std::vector<base::FilePath::StringType> entries;
   base::SplitString(data, ';', &entries);
   CHECK_GE(entries.size(), 1U) << data;
   for (size_t index = 0; index < entries.size(); ++index) {
     std::vector<base::FilePath::StringType> fields;
@@ skipping 47 matching lines @@
 
     if (video_file->min_fps_render != -1)
       video_file->min_fps_render /= num_concurrent_decoders;
     if (video_file->min_fps_no_render != -1)
       video_file->min_fps_no_render /= num_concurrent_decoders;
   }
 }
 
 void VideoDecodeAcceleratorTest::InitializeRenderingHelper(
     const RenderingHelperParams& helper_params) {
+  rendering_helper_.Setup();
+
   base::WaitableEvent done(false, false);
   rendering_loop_proxy_->PostTask(
       FROM_HERE,
       base::Bind(&RenderingHelper::Initialize,
                  base::Unretained(&rendering_helper_),
                  helper_params,
                  &done));
   done.Wait();
 }
 
@@ skipping 474 matching lines @@
       continue;
     }
     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;
   }
 
   base::ShadowingAtExitManager at_exit_manager;
+#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.
+  base::MessageLoopForUI main_loop;
+#else
   base::MessageLoop main_loop;
+#endif  // OS_WIN || USE_OZONE
   content::RenderingHelper::InitializeOneOff();
 
   return RUN_ALL_TESTS();
 }