Change cc::ElementId to be a uint64_t

cc/input/scrollbar_animation_controller_unittest.cc

Index: cc/input/scrollbar_animation_controller_unittest.cc
diff --git a/cc/input/scrollbar_animation_controller_unittest.cc b/cc/input/scrollbar_animation_controller_unittest.cc
index 07ae92a47a79fb20b07d551c8e161f3de11b65d5..5dbb3ab8eeb9eec315304957f9a469f3829d93b5 100644
--- a/cc/input/scrollbar_animation_controller_unittest.cc
+++ b/cc/input/scrollbar_animation_controller_unittest.cc
@@ -80,8 +80,7 @@ class ScrollbarAnimationControllerAuraOverlayTest : public testing::Test {
     std::unique_ptr<LayerImpl> clip =
         LayerImpl::Create(host_impl_.active_tree(), 2);
     clip_layer_ = clip.get();
-    scroll_layer->SetElementId(
-        LayerIdToElementIdForTesting(scroll_layer->id()));
+    scroll_layer->SetElementId(ElementId(scroll_layer->id()));

[suzyh_UTC10 (ex-contributor), 2017/05/05 04:27:30]

You construct an ElementId here but not elsewhere in the CL. Is this incorrect
here? It looks like scroll_layer->id() returns an int at the moment rather than
an ElementId, so that might need to change too.

[chrishtr, 2017/05/05 05:34:52]

This is incorrect, fixed.

     scroll_layer->SetScrollClipLayer(clip_layer_->id());
     LayerImpl* scroll_layer_ptr = scroll_layer.get();
 
@@ -1245,8 +1244,7 @@ class ScrollbarAnimationControllerAndroidTest
     std::unique_ptr<LayerImpl> clip =
         LayerImpl::Create(host_impl_.active_tree(), 3);
     clip_layer_ = clip.get();
-    scroll_layer->SetElementId(
-        LayerIdToElementIdForTesting(scroll_layer->id()));
+    scroll_layer->SetElementId(scroll_layer->id());
 
     scroll_layer->SetScrollClipLayer(clip_layer_->id());
     LayerImpl* scroll_layer_ptr = scroll_layer.get();