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 8e11556afe993c01b2e40cdfde98dbe1171e2895..eb29e2d84f2cc1dc079c5c4074426981cd07b3fd 100644 |
--- a/cc/trees/layer_tree_host_unittest_animation.cc |
+++ b/cc/trees/layer_tree_host_unittest_animation.cc |
@@ -720,56 +720,6 @@ class LayerTreeHostAnimationTestLayerAddedWithAnimation |
SINGLE_AND_MULTI_THREAD_TEST_F( |
LayerTreeHostAnimationTestLayerAddedWithAnimation); |
-class LayerTreeHostAnimationTestCompositeAndReadbackAnimateCount |
- : public LayerTreeHostAnimationTest { |
- public: |
- LayerTreeHostAnimationTestCompositeAndReadbackAnimateCount() |
- : animated_commit_(-1) { |
- } |
- |
- virtual void Animate(base::TimeTicks) OVERRIDE { |
- // We shouldn't animate on the CompositeAndReadback-forced commit, but we |
- // should for the SetNeedsCommit-triggered commit. |
- animated_commit_ = layer_tree_host()->source_frame_number(); |
- EXPECT_NE(2, animated_commit_); |
- } |
- |
- virtual void BeginTest() OVERRIDE { |
- PostSetNeedsCommitToMainThread(); |
- } |
- |
- virtual void DidCommit() OVERRIDE { |
- switch (layer_tree_host()->source_frame_number()) { |
- case 1: |
- layer_tree_host()->SetNeedsCommit(); |
- break; |
- case 2: { |
- char pixels[4]; |
- layer_tree_host()->CompositeAndReadback(&pixels, gfx::Rect(0, 0, 1, 1)); |
- break; |
- } |
- case 3: |
- // This is finishing the readback's commit. |
- break; |
- case 4: |
- // This is finishing the followup commit. |
- EndTest(); |
- break; |
- default: |
- NOTREACHED(); |
- } |
- } |
- |
- virtual void AfterTest() OVERRIDE { |
- EXPECT_EQ(3, animated_commit_); |
- } |
- |
- private: |
- int animated_commit_; |
-}; |
- |
-MULTI_THREAD_TEST_F(LayerTreeHostAnimationTestCompositeAndReadbackAnimateCount); |
- |
class LayerTreeHostAnimationTestContinuousAnimate |
: public LayerTreeHostAnimationTest { |
public: |