CC Animations: Rewrite unit tests to work with AnimationPlayer.

cc/animation/animation_player_unittest.cc

 // Copyright 2015 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/animation_player.h"
 
 #include "cc/animation/animation_delegate.h"
 #include "cc/animation/animation_host.h"
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/animation_timeline.h"
@@ skipping 277 matching lines @@
   client_.RegisterElement(element_id_, ElementListType::ACTIVE);
   client_impl_.RegisterElement(element_id_, ElementListType::PENDING);
   client_impl_.RegisterElement(element_id_, ElementListType::ACTIVE);
 
   const double duration = 1.;
   const float start_opacity = .7f;
   const float end_opacity = .3f;
 
   const int filter_id =
       AddAnimatedFilterToPlayer(player_.get(), duration, 0.1f, 0.9f);
-  const int opacity_id = AddOpacityTransitionToPlayer(
-      player_.get(), duration, start_opacity, end_opacity, false);
+  AddOpacityTransitionToPlayer(player_.get(), duration, start_opacity,
+                               end_opacity, false);
 
   EXPECT_FALSE(player_->needs_push_properties());
 
   host_->AddAnimationTimeline(timeline_);
   timeline_->AttachPlayer(player_);
 
   EXPECT_FALSE(player_->needs_push_properties());
   EXPECT_FALSE(player_->element_animations());
   player_->RemoveAnimation(filter_id);
   EXPECT_FALSE(player_->needs_push_properties());
 
   player_->AttachElement(element_id_);
 
   EXPECT_TRUE(player_->element_animations());
-  EXPECT_FALSE(player_->element_animations()
-                   ->GetAnimationById(filter_id));
-  EXPECT_TRUE(player_->element_animations()
-                  ->GetAnimationById(opacity_id));
+  EXPECT_FALSE(player_->element_animations()->HasAnyAnimationTargetingProperty(
+      TargetProperty::FILTER));
+  EXPECT_TRUE(player_->element_animations()->HasAnyAnimationTargetingProperty(
+      TargetProperty::OPACITY));
   EXPECT_TRUE(player_->needs_push_properties());
 
   host_->PushPropertiesTo(host_impl_);
 
   EXPECT_FALSE(client_.IsPropertyMutated(element_id_, ElementListType::ACTIVE,
                                          TargetProperty::OPACITY));
   EXPECT_FALSE(client_impl_.IsPropertyMutated(
       element_id_, ElementListType::ACTIVE, TargetProperty::OPACITY));
 
   EXPECT_FALSE(client_.IsPropertyMutated(element_id_, ElementListType::ACTIVE,
@@ skipping 77 matching lines @@
 
   host_->PushPropertiesTo(host_impl_);
 
   EXPECT_EQ(player_impl_, GetImplPlayerForLayerId(new_element_id));
   EXPECT_TRUE(player_impl_->element_animations());
   EXPECT_EQ(player_impl_->element_id(), new_element_id);
 }
 
 }  // namespace
 }  // namespace cc