| Index: cc/test/animation_timelines_test_common.h
 | 
| diff --git a/cc/test/animation_timelines_test_common.h b/cc/test/animation_timelines_test_common.h
 | 
| index f1b75747231ac8868afcb66cb4ad9cfaa04f349b..d3c9406c944e9694cde5a8e214aa2bf7d71f8ab6 100644
 | 
| --- a/cc/test/animation_timelines_test_common.h
 | 
| +++ b/cc/test/animation_timelines_test_common.h
 | 
| @@ -227,10 +227,10 @@ class AnimationTimelinesTest : public testing::Test {
 | 
|    void AnimateLayersTransferEvents(base::TimeTicks time,
 | 
|                                     unsigned expect_events);
 | 
|  
 | 
| -  AnimationPlayer* GetPlayerForLayerId(ElementId element_id);
 | 
| -  AnimationPlayer* GetImplPlayerForLayerId(ElementId element_id);
 | 
| +  AnimationPlayer* GetPlayerForElementId(ElementId element_id);
 | 
| +  AnimationPlayer* GetImplPlayerForElementId(ElementId element_id);
 | 
|  
 | 
| -  int NextTestLayerId();
 | 
| +  ElementId NextTestElementId();
 | 
|  
 | 
|    TestHostClient client_;
 | 
|    TestHostClient client_impl_;
 | 
| @@ -242,7 +242,7 @@ class AnimationTimelinesTest : public testing::Test {
 | 
|    const int player_id_;
 | 
|    int element_id_;
 | 
|  
 | 
| -  int next_test_layer_id_;
 | 
| +  ElementId next_test_element_id_;
 | 
|  
 | 
|    scoped_refptr<AnimationTimeline> timeline_;
 | 
|    scoped_refptr<AnimationPlayer> player_;
 | 
| 
 |