cc: Use sublayer scale from effect tree (1)

cc/trees/property_tree_unittest.cc

Index: cc/trees/property_tree_unittest.cc
diff --git a/cc/trees/property_tree_unittest.cc b/cc/trees/property_tree_unittest.cc
index 0cc190f791ed4d8fcf984bf713e4a5d88b22e085..89a8a4cf650bb7dd3ed892c29df48bc043a84d63 100644
--- a/cc/trees/property_tree_unittest.cc
+++ b/cc/trees/property_tree_unittest.cc
@@ -115,7 +115,8 @@ TEST(PropertyTreeSerializationTest, ClipNodeDataSerialization) {
   original.combined_clip_in_target_space = gfx::RectF(0.6f, 0.6f);
   original.clip_in_target_space = gfx::RectF(0.7f, 0.7f);
   original.transform_id = 2;
-  original.target_id = 3;
+  original.target_transform_id = 3;
+  original.target_effect_id = 4;
   original.applies_local_clip = false;
   original.layer_clipping_uses_only_local_clip = false;
   original.target_is_clipped = false;
@@ -150,14 +151,16 @@ TEST(PropertyTreeSerializationTest, ClipTreeSerialization) {
   ClipNode& root = *original.Node(0);
   root.owner_id = 1;
   root.data.transform_id = 2;
-  root.data.target_id = 1;
+  root.data.target_transform_id = 1;
+  root.data.target_effect_id = 1;
   ClipNode second;
   second.owner_id = 2;
   second.data.transform_id = 4;
   second.data.applies_local_clip = true;
   ClipNode third;
   third.owner_id = 3;
-  third.data.target_id = 3;
+  third.data.target_transform_id = 3;
+  third.data.target_effect_id = 2;
   third.data.target_is_clipped = false;
 
   original.Insert(second, 0);