Fix assumptions made in LAC::MarkAnimationsForDeletion

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 1024 matching lines @@
   void AfterTest() override {}
 
  private:
   scoped_refptr<Layer> content_;
   int num_swap_buffers_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostAnimationTestAddAnimationAfterAnimating);
 
+class LayerTreeHostAnimationTestNotifyAnimationFinished
+    : public LayerTreeHostAnimationTest {
+ public:
+  void SetupTree() override {
+    LayerTreeHostAnimationTest::SetupTree();
+    content_ = FakeContentLayer::Create(layer_settings(), &client_);
+    content_->SetBounds(gfx::Size(4, 4));
+    content_->set_layer_animation_delegate(this);
+    layer_tree_host()->root_layer()->AddChild(content_);
+  }
+
+  void BeginTest() override {
+    layer_tree_host()->SetViewportSize(gfx::Size());
+    PostAddLongAnimationToMainThread(content_.get());
+  }
+
+  void NotifyAnimationStarted(base::TimeTicks monotonic_time,
+                              Animation::TargetProperty target_property,
+                              int group) override {
+    is_called_animation_started_ = true;
+    layer_tree_host()->AnimateLayers(
+        base::TimeTicks::FromInternalValue(std::numeric_limits<int64>::max()));
+    PostSetNeedsCommitToMainThread();
+  }
+
+  void NotifyAnimationFinished(base::TimeTicks monotonic_time,
+                               Animation::TargetProperty target_property,
+                               int group) override {
+    is_called_animation_finished_ = true;
+    EndTest();
+  }
+
+  void AfterTest() override {
+    EXPECT_TRUE(is_called_animation_started_);
+    EXPECT_TRUE(is_called_animation_finished_);
+  }
+
+ private:
+  bool is_called_animation_started_ = false;
+  bool is_called_animation_finished_ = false;
+  FakeContentLayerClient client_;
+  scoped_refptr<FakeContentLayer> content_;
+};
+
+TEST_F(LayerTreeHostAnimationTestNotifyAnimationFinished,

[Lof, 2015/06/05 20:07:43]

Could you please use SINGLE_AND_MULTI_THREAD_TEST_F macro?

SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostAnimationTestNotifyAnimationFinished);

+       MainThreadAnimationNoCallbackTest) {
+  RunTest(false, false, false);
+}
+
 }  // namespace
 }  // namespace cc