cc: Move main thread hierarchy dependencies into PropertyTreeBuilder

cc/layers/layer_iterator_unittest.cc

 // 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.
 
 #include "cc/layers/layer_iterator.h"
 
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "cc/layers/layer.h"
@@ skipping 123 matching lines @@
   root_layer->AddChild(std::move(first));
   root_layer->AddChild(std::move(second));
   root_layer->AddChild(std::move(third));
   root_layer->AddChild(std::move(fourth));
 
   host_impl_.active_tree()->SetRootLayer(std::move(root_layer));
 
   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);
   EXPECT_COUNT(first_ptr, -1, -1, 3);
   EXPECT_COUNT(second_ptr, -1, -1, 2);
   EXPECT_COUNT(third_ptr, -1, -1, 1);
   EXPECT_COUNT(fourth_ptr, -1, -1, 0);
 }
 
 TEST_F(LayerIteratorTest, ComplexTree) {
@@ skipping 24 matching lines @@
   root2->AddChild(std::move(root23));
   root_layer->AddChild(std::move(root1));
   root_layer->AddChild(std::move(root2));
   root_layer->AddChild(std::move(root3));
 
   host_impl_.active_tree()->SetRootLayer(std::move(root_layer));
 
   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);
   EXPECT_COUNT(root1_ptr, -1, -1, 7);
   EXPECT_COUNT(root2_ptr, -1, -1, 6);
   EXPECT_COUNT(root21_ptr, -1, -1, 5);
   EXPECT_COUNT(root22_ptr, -1, -1, 4);
   EXPECT_COUNT(root221_ptr, -1, -1, 3);
   EXPECT_COUNT(root23_ptr, -1, -1, 2);
   EXPECT_COUNT(root231_ptr, -1, -1, 1);
@@ skipping 32 matching lines @@
   root2->AddChild(std::move(root23));
   root_layer->AddChild(std::move(root1));
   root_layer->AddChild(std::move(root2));
   root_layer->AddChild(std::move(root3));
 
   host_impl_.active_tree()->SetRootLayer(std::move(root_layer));
 
   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);
   EXPECT_COUNT(root1_ptr, -1, -1, 12);
   EXPECT_COUNT(root2_ptr, 10, 11, -1);
   EXPECT_COUNT(root21_ptr, -1, -1, 9);
   EXPECT_COUNT(root22_ptr, 7, 8, 6);
   EXPECT_COUNT(root221_ptr, -1, -1, 5);
   EXPECT_COUNT(root23_ptr, 3, 4, 2);
   EXPECT_COUNT(root231_ptr, -1, -1, 1);
   EXPECT_COUNT(root3_ptr, -1, -1, 0);
 }
 
 }  // namespace
 }  // namespace cc