cc: Add mask and replica layer ids to the effect tree

cc/trees/layer_tree_host_impl_unittest.cc

Index: cc/trees/layer_tree_host_impl_unittest.cc
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index a3895708e55b8fed40a0918a7b42007c9d5d58f9..d5223a3539e8f8b6378e2a039678a52bb291072a 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -10255,8 +10255,9 @@ TEST_F(LayerTreeHostImplTest, DidBecomeActive) {
   std::unique_ptr<FakePictureLayerImpl> mask_layer =
       FakePictureLayerImpl::Create(pending_tree, 11);
   FakePictureLayerImpl* raw_mask_layer = mask_layer.get();
-  raw_pending_layer->SetMaskLayer(std::move(mask_layer));
-  ASSERT_EQ(raw_mask_layer, raw_pending_layer->mask_layer());
+  raw_pending_layer->test_properties()->SetMaskLayer(std::move(mask_layer));
+  ASSERT_EQ(raw_mask_layer, raw_pending_layer->test_properties()->mask_layer);
+  pending_tree->BuildLayerListAndPropertyTreesForTesting();
 
   EXPECT_EQ(1u, raw_pending_layer->did_become_active_call_count());
   EXPECT_EQ(0u, raw_mask_layer->did_become_active_call_count());
@@ -10269,10 +10270,14 @@ TEST_F(LayerTreeHostImplTest, DidBecomeActive) {
   std::unique_ptr<FakePictureLayerImpl> replica_mask_layer =
       FakePictureLayerImpl::Create(pending_tree, 13);
   FakePictureLayerImpl* raw_replica_mask_layer = replica_mask_layer.get();
-  replica_layer->SetMaskLayer(std::move(replica_mask_layer));
-  raw_pending_layer->SetReplicaLayer(std::move(replica_layer));
-  ASSERT_EQ(raw_replica_mask_layer,
-            raw_pending_layer->replica_layer()->mask_layer());
+  replica_layer->test_properties()->SetMaskLayer(std::move(replica_mask_layer));
+  raw_pending_layer->test_properties()->SetReplicaLayer(
+      std::move(replica_layer));
+  ASSERT_EQ(raw_replica_mask_layer, raw_pending_layer->test_properties()
+                                        ->replica_layer->test_properties()
+                                        ->mask_layer);
+  pending_tree->property_trees()->needs_rebuild = true;
+  pending_tree->BuildLayerListAndPropertyTreesForTesting();
 
   EXPECT_EQ(2u, raw_pending_layer->did_become_active_call_count());
   EXPECT_EQ(1u, raw_mask_layer->did_become_active_call_count());