[NOT FOR REVIEW]

cc/trees/layer_tree.cc

Index: cc/trees/layer_tree.cc
diff --git a/cc/trees/layer_tree.cc b/cc/trees/layer_tree.cc
index bf07576cc69500ff0e9f14a4e76bfb444e1a2384..8284f8c76b58bcf68498f2af0383699e0f8137ba 100644
--- a/cc/trees/layer_tree.cc
+++ b/cc/trees/layer_tree.cc
@@ -376,7 +376,8 @@ void LayerTree::PushPropertiesTo(LayerTreeImpl* tree_impl,
       tree_impl->MoveChangeTrackingToLayers();
   }
   // Setting property trees must happen before pushing the page scale.
-  tree_impl->SetPropertyTrees(&property_trees_);
+  tree_impl->SetPropertyTrees(&property_trees_,
+      test_property_trees_with_new_clip_tree_);
 
   tree_impl->PushPageScaleFromMainThread(
       inputs_.page_scale_factor * unapplied_page_scale_delta,
@@ -495,6 +496,12 @@ void LayerTree::SetElementIdsForTesting() {
 void LayerTree::BuildPropertyTreesForTesting() {
   PropertyTreeBuilder::PreCalculateMetaInformation(root_layer());
   gfx::Transform identity_transform;
+  bool build_new_property_trees = true;
+  PropertyTreeBuilder::BuildPropertyTrees(
+      root_layer(), page_scale_layer(), inner_viewport_scroll_layer(),
+      outer_viewport_scroll_layer(), overscroll_elasticity_layer(),
+      elastic_overscroll(), page_scale_factor(), device_scale_factor(),
+      gfx::Rect(device_viewport_size()), identity_transform, test_property_trees_with_new_clip_tree(), build_new_property_trees);
   PropertyTreeBuilder::BuildPropertyTrees(
       root_layer(), page_scale_layer(), inner_viewport_scroll_layer(),
       outer_viewport_scroll_layer(), overscroll_elasticity_layer(),