Change cc::ElementId to be a uint64_t

third_party/WebKit/Source/web/tests/VisualViewportTest.cpp

Index: third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
index 194bd459933e5bb663996a155710248f2aa78ff7..d4c6a21057e35ccb8c9c99b96a6a6d4f84d1c24c 100644
--- a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
+++ b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
@@ -781,8 +781,9 @@ TEST_P(VisualViewportTest, TestAttachingNewFrameSetsInnerScrollLayerSize) {
   // Ensure the scroll layer matches the frame view's size.
   EXPECT_SIZE_EQ(FloatSize(320, 240), visual_viewport.ScrollLayer()->Size());
 
-  EXPECT_EQ(static_cast<int>(CompositorSubElementId::kViewport),
-            visual_viewport.ScrollLayer()->GetElementId().secondaryId);
+  EXPECT_EQ(CompositorSubElementId::kViewport,
+            SubElementIdFromCompositorElementId(
+                visual_viewport.ScrollLayer()->GetElementId()));
 
   // Ensure the location and scale were reset.
   EXPECT_SIZE_EQ(FloatSize(), visual_viewport.GetScrollOffset());