cc: Move LayerImpl::AddChild and RemoveChild to LayerImplTestProperties

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 113 matching lines @@
   std::unique_ptr<TestLayerImpl> second = CreateLayer();
   std::unique_ptr<TestLayerImpl> third = CreateLayer();
   std::unique_ptr<TestLayerImpl> fourth = CreateLayer();
 
   TestLayerImpl* root_ptr = root_layer.get();
   TestLayerImpl* first_ptr = first.get();
   TestLayerImpl* second_ptr = second.get();
   TestLayerImpl* third_ptr = third.get();
   TestLayerImpl* fourth_ptr = fourth.get();
 
-  root_layer->AddChild(std::move(first));
-  root_layer->AddChild(std::move(second));
-  root_layer->AddChild(std::move(third));
-  root_layer->AddChild(std::move(fourth));
+  root_layer->test_properties()->AddChild(std::move(first));
+  root_layer->test_properties()->AddChild(std::move(second));
+  root_layer->test_properties()->AddChild(std::move(third));
+  root_layer->test_properties()->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::CalculateDrawPropertiesForTesting(&inputs);
 
   IterateFrontToBack(&render_surface_layer_list);
   EXPECT_COUNT(root_ptr, 5, -1, 4);
@@ skipping 17 matching lines @@
   TestLayerImpl* root_ptr = root_layer.get();
   TestLayerImpl* root1_ptr = root1.get();
   TestLayerImpl* root2_ptr = root2.get();
   TestLayerImpl* root3_ptr = root3.get();
   TestLayerImpl* root21_ptr = root21.get();
   TestLayerImpl* root22_ptr = root22.get();
   TestLayerImpl* root23_ptr = root23.get();
   TestLayerImpl* root221_ptr = root221.get();
   TestLayerImpl* root231_ptr = root231.get();
 
-  root22->AddChild(std::move(root221));
-  root23->AddChild(std::move(root231));
-  root2->AddChild(std::move(root21));
-  root2->AddChild(std::move(root22));
-  root2->AddChild(std::move(root23));
-  root_layer->AddChild(std::move(root1));
-  root_layer->AddChild(std::move(root2));
-  root_layer->AddChild(std::move(root3));
+  root22->test_properties()->AddChild(std::move(root221));
+  root23->test_properties()->AddChild(std::move(root231));
+  root2->test_properties()->AddChild(std::move(root21));
+  root2->test_properties()->AddChild(std::move(root22));
+  root2->test_properties()->AddChild(std::move(root23));
+  root_layer->test_properties()->AddChild(std::move(root1));
+  root_layer->test_properties()->AddChild(std::move(root2));
+  root_layer->test_properties()->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::CalculateDrawPropertiesForTesting(&inputs);
 
   IterateFrontToBack(&render_surface_layer_list);
   EXPECT_COUNT(root_ptr, 9, -1, 8);
@@ skipping 24 matching lines @@
   TestLayerImpl* root3_ptr = root3.get();
   TestLayerImpl* root21_ptr = root21.get();
   TestLayerImpl* root22_ptr = root22.get();
   TestLayerImpl* root23_ptr = root23.get();
   TestLayerImpl* root221_ptr = root221.get();
   TestLayerImpl* root231_ptr = root231.get();
 
   root22->test_properties()->force_render_surface = true;
   root23->test_properties()->force_render_surface = true;
   root2->test_properties()->force_render_surface = true;
-  root22->AddChild(std::move(root221));
-  root23->AddChild(std::move(root231));
+  root22->test_properties()->AddChild(std::move(root221));
+  root23->test_properties()->AddChild(std::move(root231));
   root2->SetDrawsContent(false);
-  root2->AddChild(std::move(root21));
-  root2->AddChild(std::move(root22));
-  root2->AddChild(std::move(root23));
-  root_layer->AddChild(std::move(root1));
-  root_layer->AddChild(std::move(root2));
-  root_layer->AddChild(std::move(root3));
+  root2->test_properties()->AddChild(std::move(root21));
+  root2->test_properties()->AddChild(std::move(root22));
+  root2->test_properties()->AddChild(std::move(root23));
+  root_layer->test_properties()->AddChild(std::move(root1));
+  root_layer->test_properties()->AddChild(std::move(root2));
+  root_layer->test_properties()->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::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