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

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/CompositorMutableState.h"
 
 #include "base/message_loop/message_loop.h"
 #include "cc/test/fake_compositor_frame_sink.h"
 #include "cc/test/fake_impl_task_runner_provider.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
@@ skipping 81 matching lines @@
 
   std::unique_ptr<LayerImpl> scoped_layer =
       LayerImpl::Create(HostImpl().active_tree(), 11);
   LayerImpl* layer = scoped_layer.get();
   layer->SetScrollClipLayer(root->id());
 
   root->test_properties()->AddChild(std::move(scoped_layer));
 
   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);
   layer->SetMutableProperties(CompositorMutableProperty::kScrollLeft |
                               CompositorMutableProperty::kScrollTop);
 
   HostImpl().SetViewportSize(layer->bounds());
   HostImpl().active_tree()->SetRootLayerForTesting(std::move(root));
   HostImpl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
@@ skipping 29 matching lines @@
   EXPECT_TRUE(mutation.IsScrollLeftMutated());
   EXPECT_TRUE(mutation.IsScrollTopMutated());
 
   EXPECT_EQ(0.5, mutation.Opacity());
   EXPECT_EQ(zero.ToString(), gfx::Transform(mutation.Transform()).ToString());
   EXPECT_EQ(1.0, mutation.ScrollLeft());
   EXPECT_EQ(1.0, mutation.ScrollTop());
 }
 
 }  // namespace blink