cc: Move LayerImpl::AddChild and RemoveChild to LayerImplTestProperties

cc/layers/layer_impl_unittest.cc

 // Copyright 2011 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_impl.h"
 
 #include "cc/animation/mutable_properties.h"
 #include "cc/layers/painted_scrollbar_layer_impl.h"
 #include "cc/layers/solid_color_scrollbar_layer_impl.h"
 #include "cc/output/filter_operation.h"
@@ skipping 109 matching lines @@
   FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
                                   &task_graph_runner);
   host_impl.SetVisible(true);
   EXPECT_TRUE(host_impl.InitializeRenderer(output_surface.get()));
   std::unique_ptr<LayerImpl> root_clip_ptr =
       LayerImpl::Create(host_impl.active_tree(), 1);
   LayerImpl* root_clip = root_clip_ptr.get();
   std::unique_ptr<LayerImpl> root_ptr =
       LayerImpl::Create(host_impl.active_tree(), 2);
   LayerImpl* root = root_ptr.get();
-  root_clip_ptr->AddChild(std::move(root_ptr));
+  root_clip_ptr->test_properties()->AddChild(std::move(root_ptr));
   host_impl.active_tree()->SetRootLayer(std::move(root_clip_ptr));
 
   root->test_properties()->force_render_surface = true;
   root->layer_tree_impl()->ResetAllChangeTracking();
 
-  root->AddChild(LayerImpl::Create(host_impl.active_tree(), 7));
+  root->test_properties()->AddChild(
+      LayerImpl::Create(host_impl.active_tree(), 7));
   LayerImpl* child = root->test_properties()->children[0];
-  child->AddChild(LayerImpl::Create(host_impl.active_tree(), 8));
+  child->test_properties()->AddChild(
+      LayerImpl::Create(host_impl.active_tree(), 8));
   LayerImpl* grand_child = child->test_properties()->children[0];
   root->SetScrollClipLayer(root_clip->id());
   host_impl.active_tree()->BuildLayerListAndPropertyTreesForTesting();
 
   // Adding children is an internal operation and should not mark layers as
   // changed.
   EXPECT_FALSE(root->LayerPropertyChanged());
   EXPECT_FALSE(child->LayerPropertyChanged());
   EXPECT_FALSE(grand_child->LayerPropertyChanged());
 
@@ skipping 83 matching lines @@
                                   &task_graph_runner);
   host_impl.SetVisible(true);
   EXPECT_TRUE(host_impl.InitializeRenderer(output_surface.get()));
   host_impl.active_tree()->SetRootLayer(
       LayerImpl::Create(host_impl.active_tree(), 1));
   LayerImpl* root = host_impl.active_tree()->root_layer();
   root->SetHasRenderSurface(true);
   std::unique_ptr<LayerImpl> layer_ptr =
       LayerImpl::Create(host_impl.active_tree(), 2);
   LayerImpl* layer = layer_ptr.get();
-  root->AddChild(std::move(layer_ptr));
+  root->test_properties()->AddChild(std::move(layer_ptr));
   layer->SetScrollClipLayer(root->id());
   std::unique_ptr<LayerImpl> layer2_ptr =
       LayerImpl::Create(host_impl.active_tree(), 3);
   LayerImpl* layer2 = layer2_ptr.get();
-  root->AddChild(std::move(layer2_ptr));
+  root->test_properties()->AddChild(std::move(layer2_ptr));
   host_impl.active_tree()->BuildLayerListAndPropertyTreesForTesting();
   DCHECK(host_impl.CanDraw());
 
   gfx::PointF arbitrary_point_f = gfx::PointF(0.125f, 0.25f);
   float arbitrary_number = 0.352f;
   gfx::Size arbitrary_size = gfx::Size(111, 222);
   gfx::Vector2d arbitrary_vector2d = gfx::Vector2d(111, 222);
   gfx::Size large_size = gfx::Size(1000, 1000);
   SkColor arbitrary_color = SkColorSetRGB(10, 20, 30);
   gfx::Transform arbitrary_transform;
@@ skipping 128 matching lines @@
 class LayerImplScrollTest : public testing::Test {
  public:
   LayerImplScrollTest()
       : host_impl_(settings(),
                    &task_runner_provider_,
                    &shared_bitmap_manager_,
                    &task_graph_runner_),
         root_id_(7) {
     host_impl_.active_tree()->SetRootLayer(
         LayerImpl::Create(host_impl_.active_tree(), root_id_));
-    host_impl_.active_tree()->root_layer()->AddChild(
+    host_impl_.active_tree()->root_layer()->test_properties()->AddChild(
         LayerImpl::Create(host_impl_.active_tree(), root_id_ + 1));
     layer()->SetScrollClipLayer(root_id_);
     // Set the max scroll offset by noting that the root layer has bounds (1,1),
     // thus whatever bounds are set for the layer will be the max scroll
     // offset plus 1 in each direction.
     host_impl_.active_tree()->root_layer()->SetBounds(gfx::Size(1, 1));
     gfx::Vector2d max_scroll_offset(51, 81);
     layer()->SetBounds(gfx::Size(max_scroll_offset.x(), max_scroll_offset.y()));
     host_impl_.active_tree()->BuildLayerListAndPropertyTreesForTesting();
   }
@@ skipping 153 matching lines @@
 
   pending_layer->PushPropertiesTo(layer());
 
   EXPECT_VECTOR_EQ(gfx::Vector2dF(22, 23), layer()->CurrentScrollOffset());
   EXPECT_VECTOR_EQ(layer()->CurrentScrollOffset(),
                    pending_layer->CurrentScrollOffset());
 }
 
 }  // namespace
 }  // namespace cc