Change cc::ElementId to be a uint64_t

cc/animation/animation_host_perftest.cc

 // Copyright 2016 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 "base/threading/thread_task_runner_handle.h"
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/animation_player.h"
 #include "cc/animation/animation_timeline.h"
@@ skipping 49 matching lines @@
     all_players_timeline_ =
         AnimationTimeline::Create(AnimationIdProvider::NextTimelineId());
     host()->AddAnimationTimeline(all_players_timeline_);
 
     first_player_id_ = AnimationIdProvider::NextPlayerId();
     last_player_id_ = first_player_id_;
 
     for (int i = 0; i < num_players; ++i) {
       scoped_refptr<Layer> layer = Layer::Create();
       root_layer_->AddChild(layer);
-      layer->SetElementId(LayerIdToElementIdForTesting(layer->id()));
+      ElementId element_id;
+      element_id.id = layer->id();
+      layer->SetElementId(element_id);
 
       scoped_refptr<AnimationPlayer> player =
           AnimationPlayer::Create(last_player_id_);
       last_player_id_ = AnimationIdProvider::NextPlayerId();
 
       all_players_timeline_->AttachPlayer(player);
       player->AttachElement(layer->element_id());
       EXPECT_TRUE(player->element_animations());
     }
 
@@ skipping 79 matching lines @@
   CreateTimelines(10);
   DoTest();
 }
 
 TEST_F(AnimationHostPerfTest, Push1000TimelinesPropertiesTo) {
   CreateTimelines(1000);
   DoTest();
 }
 
 }  // namespace cc