Removing the animate step from DoSwapInternal as it happens in the ScheduleAnimate method now.

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 1268 matching lines @@
   int frame_count_with_pending_tree_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostAnimationTestAnimationsAddedToNewAndExistingLayers);
 
 class LayerTreeHostAnimationTestAddAnimationAfterAnimating
     : public LayerTreeHostAnimationTest {
  public:
   LayerTreeHostAnimationTestAddAnimationAfterAnimating()
-      : num_swap_buffers_(0) {}
+      : num_swap_buffers_(0), num_animate_calls_(0) {}
 
   virtual void SetupTree() OVERRIDE {
     LayerTreeHostAnimationTest::SetupTree();
     content_ = Layer::Create();
     content_->SetBounds(gfx::Size(4, 4));
     layer_tree_host()->root_layer()->AddChild(content_);
   }
 
   virtual void BeginTest() OVERRIDE { PostSetNeedsCommitToMainThread(); }
 
   virtual void DidCommit() OVERRIDE {
     switch (layer_tree_host()->source_frame_number()) {
       case 1:
         // First frame: add an animation to the root layer.
         AddAnimatedTransformToLayer(layer_tree_host()->root_layer(), 0.1, 5, 5);
         break;
       case 2:
         // Second frame: add an animation to the content layer. The root layer
         // animation has caused us to animate already during this frame.
         AddOpacityTransitionToLayer(content_.get(), 0.1, 5, 5, false);
         break;
     }
   }
 
+  virtual void Animate(base::TimeTicks monotonic_time) OVERRIDE {
+    EXPECT_LT(num_animate_calls_, num_swap_buffers_);
+    num_animate_calls_++;
+    LayerTreeHostAnimationTest::Animate(monotonic_time);
+  }
+
   virtual void SwapBuffersOnThread(LayerTreeHostImpl* host_impl,
                                    bool result) OVERRIDE {
     // After both animations have started, verify that they have valid
     // start times.
     num_swap_buffers_++;
     AnimationRegistrar::AnimationControllerMap copy =
         host_impl->animation_registrar()->active_animation_controllers();
     if (copy.size() == 2u) {
       EndTest();
       EXPECT_GE(num_swap_buffers_, 3);
@@ skipping 11 matching lines @@
         }
       }
     }
   }
 
   virtual void AfterTest() OVERRIDE {}
 
  private:
   scoped_refptr<Layer> content_;
   int num_swap_buffers_;
+  int num_animate_calls_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostAnimationTestAddAnimationAfterAnimating);
 
 }  // namespace
 }  // namespace cc