Fix cc scrollbar layer issues with initialization, and use element ids throughout.

third_party/WebKit/Source/core/animation/AnimationTest.cpp

Index: third_party/WebKit/Source/core/animation/AnimationTest.cpp
diff --git a/third_party/WebKit/Source/core/animation/AnimationTest.cpp b/third_party/WebKit/Source/core/animation/AnimationTest.cpp
index 1f653a5892b16b998aad84948b005e44cd6ee7ce..0dd77fd51e351334ebb08ff741767e761c0be3a5 100644
--- a/third_party/WebKit/Source/core/animation/AnimationTest.cpp
+++ b/third_party/WebKit/Source/core/animation/AnimationTest.cpp
@@ -797,8 +797,9 @@ TEST_F(AnimationAnimationTest, NoCompositeWithoutCompositedElementId) {
   Optional<CompositorElementIdSet> composited_element_ids =
       CompositorElementIdSet();
   CompositorElementId expected_compositor_element_id =
-      CreateCompositorElementId(DOMNodeIds::IdForNode(element_composited),
-                                CompositorSubElementId::kPrimary);
+      CompositorElementIdFromDOMNodeId(
+          DOMNodeIds::IdForNode(element_composited),
+          CompositorElementIdNamespace::kPrimary);
   composited_element_ids->insert(expected_compositor_element_id);
 
   Timing timing;