Change cc::ElementId to be a uint64_t

cc/layers/scrollbar_layer_unittest.cc

Index: cc/layers/scrollbar_layer_unittest.cc
diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
index 177b6b2ed752009363c3fd6e099914407f9ff63d..70ec4ce158735361de135f09457019d4913a023c 100644
--- a/cc/layers/scrollbar_layer_unittest.cc
+++ b/cc/layers/scrollbar_layer_unittest.cc
@@ -291,7 +291,9 @@ TEST_F(ScrollbarLayerTest, ScrollOffsetSynchronization) {
   std::unique_ptr<Scrollbar> scrollbar(new FakeScrollbar);
   scoped_refptr<Layer> layer_tree_root = Layer::Create();
   scoped_refptr<Layer> scroll_layer = Layer::Create();
-  scroll_layer->SetElementId(LayerIdToElementIdForTesting(scroll_layer->id()));
+  ElementId element_id;
+  element_id.id = scroll_layer->id();
+  scroll_layer->SetElementId(element_id);
   scoped_refptr<Layer> content_layer = Layer::Create();
   scoped_refptr<Layer> scrollbar_layer = PaintedScrollbarLayer::Create(
       std::move(scrollbar), scroll_layer->element_id());
@@ -404,7 +406,9 @@ TEST_F(ScrollbarLayerTest, ThumbRect) {
   scoped_refptr<FakePaintedScrollbarLayer> scrollbar_layer =
       FakePaintedScrollbarLayer::Create(false, true, root_layer->element_id());
 
-  root_layer->SetElementId(LayerIdToElementIdForTesting(root_layer->id()));
+  ElementId element_id;
+  element_id.id = root_layer->id();
+  root_layer->SetElementId(element_id);
   root_layer->SetScrollClipLayerId(root_clip_layer->id());
   // Give the root-clip a size that will result in MaxScrollOffset = (80, 0).
   root_clip_layer->SetBounds(gfx::Size(20, 50));
@@ -595,7 +599,9 @@ TEST_F(ScrollbarLayerTest, LayerDrivenSolidColorDrawQuads) {
 
   scoped_refptr<Layer> layer_tree_root = Layer::Create();
   scoped_refptr<Layer> scroll_layer = Layer::Create();
-  scroll_layer->SetElementId(LayerIdToElementIdForTesting(scroll_layer->id()));
+  ElementId element_id;
+  element_id.id = scroll_layer->id();
+  scroll_layer->SetElementId(element_id);
   scroll_layer->SetScrollClipLayerId(layer_tree_root->id());
   scoped_refptr<Layer> child1 = Layer::Create();
   scoped_refptr<Layer> child2;
@@ -729,7 +735,9 @@ TEST_F(ScrollbarLayerTest, ScrollbarLayerPushProperties) {
 
   scoped_refptr<Layer> layer_tree_root = Layer::Create();
   scoped_refptr<Layer> scroll_layer = Layer::Create();
-  scroll_layer->SetElementId(LayerIdToElementIdForTesting(scroll_layer->id()));
+  ElementId element_id;
+  element_id.id = scroll_layer->id();
+  scroll_layer->SetElementId(element_id);
   scroll_layer->SetScrollClipLayerId(layer_tree_root->id());
   scoped_refptr<Layer> child1 = Layer::Create();
   scoped_refptr<Layer> scrollbar_layer;
@@ -774,7 +782,9 @@ TEST_F(ScrollbarLayerTest, SubPixelCanScrollOrientation) {
   LayerImpl* scroll_layer = impl.AddChild<LayerImpl>(clip_layer);
 
   scroll_layer->SetScrollClipLayer(clip_layer->id());
-  scroll_layer->SetElementId(LayerIdToElementIdForTesting(scroll_layer->id()));
+  ElementId element_id;
+  element_id.id = scroll_layer->id();
+  scroll_layer->SetElementId(element_id);
 
   const int kTrackStart = 0;
   const int kThumbThickness = 10;