SubtreeShouldBeSkipped uses information from property trees

cc/test/layer_test_common.cc

Index: cc/test/layer_test_common.cc
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc
index 0e3020ec59fb1ec3dd5c4908de83f793116c87a2..0ef1f02ad21025c0a8e384d27b535a9eddf3daba 100644
--- a/cc/test/layer_test_common.cc
+++ b/cc/test/layer_test_common.cc
@@ -125,10 +125,10 @@ LayerTestCommon::LayerImplTest::LayerImplTest(const LayerTreeSettings& settings)
       host_(FakeLayerTreeHost::Create(&client_, &task_graph_runner_, settings)),
       render_pass_(RenderPass::Create()),
       layer_impl_id_(2) {
-  scoped_ptr<LayerImpl> root_layer_impl =
+  scoped_ptr<LayerImpl> root =
       LayerImpl::Create(host_->host_impl()->active_tree(), 1);
-  root_layer_impl->SetHasRenderSurface(true);
-  host_->host_impl()->active_tree()->SetRootLayer(std::move(root_layer_impl));
+  host_->host_impl()->active_tree()->SetRootLayer(std::move(root));
+  root_layer()->SetHasRenderSurface(true);
   host_->host_impl()->SetVisible(true);
   host_->host_impl()->InitializeRenderer(output_surface_.get());
 
@@ -152,8 +152,7 @@ void LayerTestCommon::LayerImplTest::CalcDrawProps(
   LayerImplList layer_list;
   host_->host_impl()->active_tree()->IncrementRenderSurfaceListIdForTesting();
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
-      host_->host_impl()->active_tree()->root_layer(), viewport_size,
-      &layer_list,
+      root_layer(), viewport_size, &layer_list,
       host_->host_impl()->active_tree()->current_render_surface_list_id());
   LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 }
@@ -214,8 +213,7 @@ void LayerTestCommon::LayerImplTest::RequestCopyOfOutput() {
   std::vector<scoped_ptr<CopyOutputRequest>> copy_requests;
   copy_requests.push_back(
       CopyOutputRequest::CreateRequest(base::Bind(&EmptyCopyOutputCallback)));
-  host_->host_impl()->active_tree()->root_layer()->PassCopyRequests(
-      &copy_requests);
+  root_layer()->PassCopyRequests(&copy_requests);
 }
 
 }  // namespace cc