cc: Move main thread hierarchy dependencies into PropertyTreeBuilder

cc/layers/layer_iterator_unittest.cc

Index: cc/layers/layer_iterator_unittest.cc
diff --git a/cc/layers/layer_iterator_unittest.cc b/cc/layers/layer_iterator_unittest.cc
index 9c23d32a7b30b3a662bbec85a50075a2195b2caa..3e8cb0990d5ba4f4ff2b263325663f28c0b48a14 100644
--- a/cc/layers/layer_iterator_unittest.cc
+++ b/cc/layers/layer_iterator_unittest.cc
@@ -141,7 +141,7 @@ TEST_F(LayerIteratorTest, SimpleTree) {
   LayerImplList render_surface_layer_list;
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
       root_ptr, root_ptr->bounds(), &render_surface_layer_list);
-  LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+  LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
 
   IterateFrontToBack(&render_surface_layer_list);
   EXPECT_COUNT(root_ptr, 5, -1, 4);
@@ -186,7 +186,7 @@ TEST_F(LayerIteratorTest, ComplexTree) {
   LayerImplList render_surface_layer_list;
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
       root_ptr, root_ptr->bounds(), &render_surface_layer_list);
-  LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+  LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
 
   IterateFrontToBack(&render_surface_layer_list);
   EXPECT_COUNT(root_ptr, 9, -1, 8);
@@ -239,7 +239,7 @@ TEST_F(LayerIteratorTest, ComplexTreeMultiSurface) {
   LayerImplList render_surface_layer_list;
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
       root_ptr, root_ptr->bounds(), &render_surface_layer_list);
-  LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+  LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
 
   IterateFrontToBack(&render_surface_layer_list);
   EXPECT_COUNT(root_ptr, 14, -1, 13);