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

cc/trees/layer_tree_host_unittest.cc

 // Copyright 2011 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 "cc/trees/layer_tree_host.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 1176 matching lines @@
         layer_tree_host()->root_layer()->RemoveAllChildren();
         layer_tree_host()->root_layer()->SetMaskLayer(mask_layer.get());
         break;
     }
   }
 
   void CommitCompleteOnThread(LayerTreeHostImpl* impl) override {
     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;
     }
   }
 
   void AfterTest() override {}
 
   scoped_refptr<Layer> mask_layer;
   int index_;
 };
@@ skipping 5455 matching lines @@
     EndTest();
   }
 
   void AfterTest() override {}
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPaintedDeviceScaleFactor);
 
 }  // namespace
 }  // namespace cc