CC Animation: Start replacing int layer_id with ElementId element_id.

cc/animation/animation_host_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_host.h"
 
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/animation_timeline.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/animation_timelines_test_common.h"
@@ skipping 63 matching lines @@
   host->AddAnimationTimeline(timeline.get());
   host_impl->AddAnimationTimeline(timeline_impl.get());
 
   host->PushPropertiesTo(host_impl.get());
 
   EXPECT_TRUE(host->GetTimelineById(timeline_id1));
   EXPECT_TRUE(host_impl->GetTimelineById(timeline_id2));
 }
 
 TEST_F(AnimationHostTest, ImplOnlyScrollAnimationUpdateTargetIfDetached) {
-  client_.RegisterLayer(layer_id_, LayerTreeType::ACTIVE);
-  client_impl_.RegisterLayer(layer_id_, LayerTreeType::PENDING);
+  client_.RegisterLayer(element_id_, LayerTreeType::ACTIVE);
+  client_impl_.RegisterLayer(element_id_, LayerTreeType::PENDING);
 
   gfx::ScrollOffset target_offset(0., 2.);
   gfx::ScrollOffset current_offset(0., 1.);
-  host_impl_->ImplOnlyScrollAnimationCreate(layer_id_, target_offset,
+  host_impl_->ImplOnlyScrollAnimationCreate(element_id_, target_offset,
                                             current_offset);
 
   gfx::Vector2dF scroll_delta(0, 0.5);
   gfx::ScrollOffset max_scroll_offset(0., 3.);
 
   base::TimeTicks time;
 
   time += base::TimeDelta::FromSecondsD(0.1);
   EXPECT_TRUE(host_impl_->ImplOnlyScrollAnimationUpdateTarget(
-      layer_id_, scroll_delta, max_scroll_offset, time));
+      element_id_, scroll_delta, max_scroll_offset, time));
 
   // Detach all players from layers and timelines.
   host_impl_->ClearTimelines();
 
   time += base::TimeDelta::FromSecondsD(0.1);
   EXPECT_FALSE(host_impl_->ImplOnlyScrollAnimationUpdateTarget(
-      layer_id_, scroll_delta, max_scroll_offset, time));
+      element_id_, scroll_delta, max_scroll_offset, time));
 }
 
 }  // namespace
 }  // namespace cc