Use WaitForSwap in LayerWithRealCompositorTest.ReportMetrics

ui/compositor/layer_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.
 
 #include "ui/compositor/layer.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 2191 matching lines @@
 
  private:
   bool report_called_ = false;
   int value_ = -1;
 
   DISALLOW_COPY_AND_ASSIGN(TestMetricsReporter);
 };
 
 // TODO(crbug/709080): LayerWithRealCompositorTest.ReportMetrics is flaky on
 // Windows.
 #if defined(OS_WIN)

[danakj, 2017/04/20 13:46:31]

Should it be enabled on windows now?

[Alex Z., 2017/04/20 13:53:59]

Done.

 #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) {
   std::unique_ptr<Layer> root(CreateLayer(LAYER_SOLID_COLOR));
   GetCompositor()->SetRootLayer(root.get());
   LayerAnimator* animator = root->GetAnimator();
   std::unique_ptr<ui::LayerAnimationElement> animation_element =
       ui::LayerAnimationElement::CreateColorElement(
           SK_ColorRED, base::TimeDelta::FromMilliseconds(100));
   ui::LayerAnimationSequence* animation_sequence =
       new ui::LayerAnimationSequence(std::move(animation_element));
   TestMetricsReporter reporter;
   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
   // value was reported.
   EXPECT_GT(reporter.value(), 0);
 }
 
 TEST(LayerDebugInfoTest, LayerNameDoesNotClobber) {
   Layer layer(LAYER_NOT_DRAWN);
   layer.set_name("foo");
   std::unique_ptr<base::trace_event::ConvertableToTraceFormat> debug_info =
       layer.TakeDebugInfo(nullptr);
   std::string trace_format("bar,");
   debug_info->AppendAsTraceFormat(&trace_format);
   std::string expected("bar,{\"layer_name\":\"foo\"}");
   EXPECT_EQ(expected, trace_format);
 }
 
 }  // namespace ui