Index: cc/trees/layer_tree_host_unittest_animation.cc |
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc |
index 64dd31d2c931fd7c2dfb3e3a8fa61512c1b5bbde..e946b427b602fc0d9a9a12a2a6b33f5eb2750f6e 100644 |
--- a/cc/trees/layer_tree_host_unittest_animation.cc |
+++ b/cc/trees/layer_tree_host_unittest_animation.cc |
@@ -726,9 +726,7 @@ class LayerTreeHostAnimationTestContinuousAnimate |
: public LayerTreeHostAnimationTest { |
public: |
LayerTreeHostAnimationTestContinuousAnimate() |
- : num_commit_complete_(0), |
- num_draw_layers_(0) { |
- } |
+ : num_commit_complete_(0), num_draw_layers_(0), have_animated_(false) {} |
virtual void SetupTree() OVERRIDE { |
LayerTreeHostAnimationTest::SetupTree(); |
@@ -747,6 +745,7 @@ class LayerTreeHostAnimationTestContinuousAnimate |
if (num_draw_layers_ == 2) |
return; |
layer_tree_host()->SetNeedsAnimate(); |
+ have_animated_ = true; |
} |
virtual void Layout() OVERRIDE { |
@@ -767,16 +766,18 @@ class LayerTreeHostAnimationTestContinuousAnimate |
virtual void AfterTest() OVERRIDE { |
// Check that we didn't commit twice between first and second draw. |
EXPECT_EQ(1, num_commit_complete_); |
+ EXPECT_TRUE(have_animated_); |
} |
private: |
int num_commit_complete_; |
int num_draw_layers_; |
+ bool have_animated_; |
FakeContentLayerClient client_; |
scoped_refptr<FakeContentLayer> content_; |
}; |
-MULTI_THREAD_TEST_F(LayerTreeHostAnimationTestContinuousAnimate); |
+SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostAnimationTestContinuousAnimate); |
class LayerTreeHostAnimationTestCancelAnimateCommit |
: public LayerTreeHostAnimationTest { |