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

cc/test/layer_test_common.h

 // Copyright 2012 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.
 
 #ifndef CC_TEST_LAYER_TEST_COMMON_H_
 #define CC_TEST_LAYER_TEST_COMMON_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 61 matching lines @@
       T* ptr = layer.get();
       parent->AddChild(std::move(layer));
       return ptr;
     }
 
     template <typename T>
     T* AddReplicaLayer(LayerImpl* origin) {
       std::unique_ptr<T> layer =
           T::Create(host_->host_impl()->active_tree(), layer_impl_id_++);
       T* ptr = layer.get();
-      origin->SetReplicaLayer(std::move(layer));
+      origin->test_properties()->SetReplicaLayer(std::move(layer));
       return ptr;
     }
 
     template <typename T, typename A>
     T* AddChildToRoot(const A& a) {
       std::unique_ptr<T> layer =
           T::Create(host_->host_impl()->active_tree(), layer_impl_id_++, a);
       T* ptr = layer.get();
       root_layer()->AddChild(std::move(layer));
       return ptr;
@@ skipping 72 matching lines @@
     std::unique_ptr<RenderPass> render_pass_;
     scoped_refptr<AnimationTimeline> timeline_;
     scoped_refptr<AnimationTimeline> timeline_impl_;
     int layer_impl_id_;
   };
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_LAYER_TEST_COMMON_H_