cc: Move main thread hierarchy dependencies into PropertyTreeBuilder

cc/test/layer_tree_host_common_test.cc

Index: cc/test/layer_tree_host_common_test.cc
diff --git a/cc/test/layer_tree_host_common_test.cc b/cc/test/layer_tree_host_common_test.cc
index 6ac0c57d3299324f1d2f54f0994b0b2a9a160ea7..4f2be2b4fc4b57165cd0513f05eb8c8a3edb84b2 100644
--- a/cc/test/layer_tree_host_common_test.cc
+++ b/cc/test/layer_tree_host_common_test.cc
@@ -74,7 +74,7 @@ void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties(
     Layer* page_scale_layer,
     bool can_use_lcd_text,
     bool layers_always_allowed_lcd_text) {
-  LayerTreeHostCommon::PreCalculateMetaInformation(root_layer);
+  PropertyTreeBuilder::PreCalculateMetaInformation(root_layer);
 
   EXPECT_TRUE(page_scale_layer || (page_scale_factor == 1.f));
   gfx::Transform identity_matrix;
@@ -96,7 +96,7 @@ void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties(
 void LayerTreeHostCommonTestBase::
     ExecuteCalculateDrawPropertiesWithPropertyTrees(Layer* root_layer) {
   DCHECK(root_layer->layer_tree_host());
-  LayerTreeHostCommon::PreCalculateMetaInformation(root_layer);
+  PropertyTreeBuilder::PreCalculateMetaInformation(root_layer);
 
   gfx::Transform identity_transform;
 
@@ -138,7 +138,7 @@ void LayerTreeHostCommonTestBase::
 void LayerTreeHostCommonTestBase::
     ExecuteCalculateDrawPropertiesWithPropertyTrees(LayerImpl* root_layer) {
   DCHECK(root_layer->layer_tree_impl());
-  LayerTreeHostCommon::PreCalculateMetaInformationForTesting(root_layer);
+  PropertyTreeBuilder::PreCalculateMetaInformationForTesting(root_layer);
 
   gfx::Transform identity_transform;
 
@@ -198,7 +198,7 @@ void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties(
   inputs.layers_always_allowed_lcd_text = layers_always_allowed_lcd_text;
   inputs.can_adjust_raster_scales = true;
 
-  LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+  LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
 }
 
 void LayerTreeHostCommonTestBase::
@@ -215,7 +215,7 @@ void LayerTreeHostCommonTestBase::
   inputs.can_adjust_raster_scales = true;
   inputs.can_render_to_separate_surface = false;
 
-  LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+  LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
 }
 
 bool LayerTreeHostCommonTestBase::UpdateLayerListContains(int id) const {