From 782f08280c3f5bf89eff992ae0f550c5309dc8b4 Mon Sep 17 00:00:00 2001
From: David Worsham <dworsham@google.com>
Date: Mon, 24 Aug 2020 12:47:31 -0700
Subject: [PATCH] fuchsia: Clean shell_unittests under FEMU (#20704)

---
 shell/common/BUILD.gn           | 5 +----
 shell/common/shell_unittests.cc | 7 -------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn
index 62277b8b35e..f377d643ff1 100644
--- a/shell/common/BUILD.gn
+++ b/shell/common/BUILD.gn
@@ -238,10 +238,7 @@ if (enable_unittests) {
 
       public_configs += [ ":test_enable_vulkan_config" ]
 
-      public_deps += [
-        "//flutter/testing:vulkan",
-        "//flutter/vulkan",
-      ]
+      public_deps += [ "//flutter/vulkan" ]
     }
   }
 
diff --git a/shell/common/shell_unittests.cc b/shell/common/shell_unittests.cc
index 30e03d1818f..750b03f7a1c 100644
--- a/shell/common/shell_unittests.cc
+++ b/shell/common/shell_unittests.cc
@@ -967,15 +967,8 @@ TEST_F(ShellTest, ReportTimingsIsCalledSoonerInNonReleaseMode) {
 #else
   // Our batch time is 100ms. Hopefully the 500ms limit is relaxed enough to
   // make it not too flaky.
-  //
-  // TODO(https://github.com/flutter/flutter/issues/64087): Fuchsia uses a
-  // 2000ms timeout to handle slowdowns in FEMU.
-#if OS_FUCHSIA
-  ASSERT_TRUE(elapsed <= fml::TimeDelta::FromMilliseconds(2000));
-#else
   ASSERT_TRUE(elapsed <= fml::TimeDelta::FromMilliseconds(500));
 #endif
-#endif
 }
 
 TEST_F(ShellTest, ReportTimingsIsCalledImmediatelyAfterTheFirstFrame) {