From 89533f0c24101496243a63b05d6f2a970f6cc30c Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Mon, 31 Aug 2020 14:06:54 -0700
Subject: [PATCH] Wait for first frame before checking layer tree

---
 shell/common/shell_unittests.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/shell/common/shell_unittests.cc b/shell/common/shell_unittests.cc
index 18bba5b28fcc4..0b3c5844efb84 100644
--- a/shell/common/shell_unittests.cc
+++ b/shell/common/shell_unittests.cc
@@ -599,13 +599,11 @@ TEST_F(ShellTest,
 
 TEST_F(ShellTest, OnPlatformViewDestroyDisablesThreadMerger) {
   auto settings = CreateSettingsForFixture();
-  fml::AutoResetWaitableEvent end_frame_latch;
   fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger;
   auto end_frame_callback =
       [&](bool should_resubmit_frame,
           fml::RefPtr<fml::RasterThreadMerger> thread_merger) {
         raster_thread_merger = thread_merger;
-        end_frame_latch.Signal();
       };
   auto external_view_embedder = std::make_shared<ShellTestExternalViewEmbedder>(
       end_frame_callback, PostPrerollResult::kSuccess, true);
@@ -639,7 +637,10 @@ TEST_F(ShellTest, OnPlatformViewDestroyDisablesThreadMerger) {
 
   PumpOneFrame(shell.get(), 100, 100, builder);
 
-  end_frame_latch.Wait();
+  auto result =
+      shell->WaitForFirstFrame(fml::TimeDelta::FromMilliseconds(1000));
+  ASSERT_TRUE(result.ok());
+
   ASSERT_TRUE(raster_thread_merger->IsEnabled());
 
   ValidateDestroyPlatformView(shell.get());