Change cc::ElementId to be a uint64_t

cc/layers/layer_unittest.cc

Index: cc/layers/layer_unittest.cc
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index 1a227ca01aeb877cc50b945bcdd2676d320102d6..ea59a9dfea84fe1f69ea142988e3489d6d9874b0 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -929,7 +929,9 @@ TEST_F(LayerTest, CheckPropertyChangeCausesCorrectBehavior) {
       gfx::Rect(10, 10)));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetForceRenderSurfaceForTesting(true));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetHideLayerAndSubtree(true));
-  EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetElementId(ElementId(2, 0)));
+  ElementId element_id;
+  element_id.id = 2;
+  EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetElementId(element_id));
   EXPECT_SET_NEEDS_COMMIT(
       1, test_layer->SetMutableProperties(MutableProperty::kTransform));
 
@@ -1385,9 +1387,11 @@ TEST_F(LayerTest, AnimationSchedulesLayerUpdate) {
   // though currently there is no good place for this unittest to go. Move to
   // LayerTreeHost unittest when there is a good setup.
   scoped_refptr<Layer> layer = Layer::Create();
-  layer->SetElementId(ElementId(2, 0));
+  ElementId element_id;
+  element_id.id = 2;
+  layer->SetElementId(element_id);
   EXPECT_SET_NEEDS_FULL_TREE_SYNC(1, layer_tree_host_->SetRootLayer(layer));
-  auto element_id = layer->element_id();
+  element_id = layer->element_id();
 
   EXPECT_CALL(*layer_tree_host_, SetNeedsUpdateLayers()).Times(1);
   layer_tree_host_->SetElementOpacityMutated(element_id,
@@ -1419,7 +1423,9 @@ TEST_F(LayerTest, ElementIdAndMutablePropertiesArePushed) {
 
   EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(2);
 
-  test_layer->SetElementId(ElementId(2, 0));
+  ElementId element_id;
+  element_id.id = 2;
+  test_layer->SetElementId(element_id);
   test_layer->SetMutableProperties(MutableProperty::kTransform);
 
   EXPECT_FALSE(impl_layer->element_id());
@@ -1427,7 +1433,7 @@ TEST_F(LayerTest, ElementIdAndMutablePropertiesArePushed) {
 
   test_layer->PushPropertiesTo(impl_layer.get());
 
-  EXPECT_EQ(ElementId(2, 0), impl_layer->element_id());
+  EXPECT_EQ(2u, impl_layer->element_id().id);
   EXPECT_EQ(MutableProperty::kTransform, impl_layer->mutable_properties());
 }