Fix assumptions made in LAC::MarkAnimationsForDeletion

cc/animation/layer_animation_controller_unittest.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/animation/layer_animation_controller.h"
 
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/animation_delegate.h"
 #include "cc/animation/animation_registrar.h"
@@ skipping 1415 matching lines @@
 
 // Tests that skipping a call to UpdateState works as expected.
 TEST(LayerAnimationControllerTest, SkipUpdateState) {
   scoped_ptr<AnimationEventsVector> events(
       make_scoped_ptr(new AnimationEventsVector));
   FakeLayerAnimationValueObserver dummy;
   scoped_refptr<LayerAnimationController> controller(
       LayerAnimationController::Create(0));
   controller->AddValueObserver(&dummy);
 
-  controller->AddAnimation(CreateAnimation(
+  scoped_ptr<Animation> first_animation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeTransformTransition(1)).Pass(), 1,
       Animation::TRANSFORM));
+  first_animation->set_is_controlling_instance_for_test(true);
+  controller->AddAnimation(first_animation.Pass());
 
   controller->Animate(kInitialTickTime);
   controller->UpdateState(true, events.get());
 
-  controller->AddAnimation(CreateAnimation(
+  scoped_ptr<Animation> second_animation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)).Pass(),
       2, Animation::OPACITY));
+  second_animation->set_is_controlling_instance_for_test(true);
+  controller->AddAnimation(second_animation.Pass());
 
   // Animate but don't UpdateState.
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(1000));
 
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(2000));
   events.reset(new AnimationEventsVector);
   controller->UpdateState(true, events.get());
 
   // Should have one STARTED event and one FINISHED event.
   EXPECT_EQ(2u, events->size());
@@ skipping 281 matching lines @@
   scoped_ptr<AnimationEventsVector> events(
       make_scoped_ptr(new AnimationEventsVector));
   FakeLayerAnimationValueObserver dummy_impl;
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
   controller_impl->AddValueObserver(&dummy_impl);
 
   const int group_id = 1;
 
   // Add two animations with the same group id but different durations.
-  controller_impl->AddAnimation(Animation::Create(
+  scoped_ptr<Animation> first_animation(Animation::Create(
       scoped_ptr<AnimationCurve>(new FakeTransformTransition(2.0)).Pass(), 1,
       group_id, Animation::TRANSFORM));
-  controller_impl->AddAnimation(Animation::Create(
+  first_animation->set_is_controlling_instance_for_test(true);
+  controller_impl->AddAnimation(first_animation.Pass());
+
+  scoped_ptr<Animation> second_animation(Animation::Create(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)).Pass(),
       2, group_id, Animation::OPACITY));
+  second_animation->set_is_controlling_instance_for_test(true);
+  controller_impl->AddAnimation(second_animation.Pass());
 
   controller_impl->Animate(kInitialTickTime);
   controller_impl->UpdateState(true, events.get());
 
   // Both animations should have started.
   EXPECT_EQ(2u, events->size());
   EXPECT_EQ(AnimationEvent::STARTED, (*events)[0].type);
   EXPECT_EQ(AnimationEvent::STARTED, (*events)[1].type);
 
   events.reset(new AnimationEventsVector);
@@ skipping 24 matching lines @@
 // event for the aborted animation.
 TEST(LayerAnimationControllerTest, FinishedAndAbortedEventsForGroup) {
   scoped_ptr<AnimationEventsVector> events(
       make_scoped_ptr(new AnimationEventsVector));
   FakeLayerAnimationValueObserver dummy_impl;
   scoped_refptr<LayerAnimationController> controller_impl(
       LayerAnimationController::Create(0));
   controller_impl->AddValueObserver(&dummy_impl);
 
   // Add two animations with the same group id.
-  controller_impl->AddAnimation(CreateAnimation(
+  scoped_ptr<Animation> first_animation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeTransformTransition(1.0)).Pass(), 1,
       Animation::TRANSFORM));
-  controller_impl->AddAnimation(CreateAnimation(
+  first_animation->set_is_controlling_instance_for_test(true);
+  controller_impl->AddAnimation(first_animation.Pass());
+
+  scoped_ptr<Animation> second_animation(CreateAnimation(
       scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)).Pass(),
       1, Animation::OPACITY));
+  second_animation->set_is_controlling_instance_for_test(true);
+  controller_impl->AddAnimation(second_animation.Pass());
 
   controller_impl->Animate(kInitialTickTime);
   controller_impl->UpdateState(true, events.get());
 
   // Both animations should have started.
   EXPECT_EQ(2u, events->size());
   EXPECT_EQ(AnimationEvent::STARTED, (*events)[0].type);
   EXPECT_EQ(AnimationEvent::STARTED, (*events)[1].type);
 
   controller_impl->AbortAnimations(Animation::OPACITY);
@@ skipping 642 matching lines @@
   EXPECT_FALSE(controller->IsAnimatingProperty(Animation::OPACITY));
   EXPECT_FALSE(controller->IsAnimatingProperty(Animation::FILTER));
 
   controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(2000));
   controller->UpdateState(true, nullptr);
   EXPECT_TRUE(controller->IsAnimatingProperty(Animation::OPACITY));
 }
 
 }  // namespace
 }  // namespace cc