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

cc/trees/layer_tree_host_unittest.cc

Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 4300f62032d764372db3016045c924e6227bc4cc..80635f02a7be8dcc42eca0b4a03c674d48b38740 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -1194,10 +1194,12 @@ class LayerTreeHostTestSwitchMaskLayer : public LayerTreeHostTest {
     switch (index_) {
       case 0:
         index_++;
-        EXPECT_FALSE(impl->sync_tree()->root_layer()->mask_layer());
+        EXPECT_FALSE(
+            impl->sync_tree()->root_layer()->render_surface()->MaskLayer());
         break;
       case 1:
-        EXPECT_TRUE(impl->sync_tree()->root_layer()->mask_layer());
+        EXPECT_TRUE(
+            impl->sync_tree()->root_layer()->render_surface()->MaskLayer());
         EndTest();
         break;
     }