Remove CompositeAndReadback from LayerTreeHost(Impl) and the Proxys.

cc/trees/layer_tree_host_unittest_animation.cc

 // Copyright 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 "cc/trees/layer_tree_host.h"
 
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/animation/scroll_offset_animation_curve.h"
 #include "cc/animation/timing_function.h"
@@ skipping 702 matching lines @@
       base::TimeTicks monotonic_time) OVERRIDE {
     EndTest();
   }
 
   virtual void AfterTest() OVERRIDE {}
 };
 
 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:
   LayerTreeHostAnimationTestContinuousAnimate()
       : num_commit_complete_(0),
         num_draw_layers_(0) {
   }
 
   virtual void SetupTree() OVERRIDE {
     LayerTreeHostAnimationTest::SetupTree();
@@ skipping 598 matching lines @@
  private:
   scoped_refptr<Layer> content_;
   int num_swap_buffers_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostAnimationTestAddAnimationAfterAnimating);
 
 }  // namespace
 }  // namespace cc