Use WaitForSwap in LayerWithRealCompositorTest.ReportMetrics

ui/compositor/layer_unittest.cc

Index: ui/compositor/layer_unittest.cc
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc
index 911788fede5f9eaf0d6d06549093f1398a4ea02d..ebc270768599a3be106eb2306c4de460037ad8d8 100644
--- a/ui/compositor/layer_unittest.cc
+++ b/ui/compositor/layer_unittest.cc
@@ -2207,17 +2207,9 @@ class TestMetricsReporter : public ui::AnimationMetricsReporter {
   DISALLOW_COPY_AND_ASSIGN(TestMetricsReporter);
 };
 
-// TODO(crbug/709080): LayerWithRealCompositorTest.ReportMetrics is flaky on
-// Windows.
-#if defined(OS_WIN)
-#define MAYBE_ReportMetrics DISABLED_ReportMetrics
-#else
-#define MAYBE_ReportMetrics ReportMetrics
-#endif
-
 // Starts an animation and tests that incrementing compositor frame count can
 // be used to report animation smoothness metrics.
-TEST_F(LayerWithRealCompositorTest, MAYBE_ReportMetrics) {
+TEST_F(LayerWithRealCompositorTest, ReportMetrics) {
   std::unique_ptr<Layer> root(CreateLayer(LAYER_SOLID_COLOR));
   GetCompositor()->SetRootLayer(root.get());
   LayerAnimator* animator = root->GetAnimator();
@@ -2230,7 +2222,7 @@ TEST_F(LayerWithRealCompositorTest, MAYBE_ReportMetrics) {
   animation_sequence->SetAnimationMetricsReporter(&reporter);
   animator->StartAnimation(animation_sequence);
   while (!reporter.report_called())
-    WaitForDraw();
+    WaitForSwap();
   ResetCompositor();
   // Even though most of the time 100% smooth animations are expected, on the
   // test bots this cannot be guaranteed. Therefore simply check that some