[SPv1] Always set a CompositorElementId on main graphics layers; use PaintLayer id.

third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp

Index: third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp
index 9d085807f3fa92e5b0473cbdd21fe0edef48e5b2..f8c49c2423fa7831a3d8f5d1a4cd2535f279ac80 100644
--- a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp
@@ -99,11 +99,11 @@ TEST_F(CompositorMutableStateTest, MutableStateMutableProperties) {
 
   SetLayerPropertiesForTesting(layer);
 
-  int primary_id = 12;
+  uint64_t primary_id = 12;
   root->SetElementId(CompositorElementIdFromDOMNodeId(
-      primary_id, CompositorElementIdNamespace::kPrimary));
+      primary_id, CompositorElementIdNamespace::kPrimaryCompositorProxy));
   layer->SetElementId(CompositorElementIdFromDOMNodeId(
-      primary_id, CompositorElementIdNamespace::kScroll));
+      primary_id, CompositorElementIdNamespace::kScrollCompositorProxy));
 
   root->SetMutableProperties(CompositorMutableProperty::kOpacity |
                              CompositorMutableProperty::kTransform);