cc : Stop pushing properties not used by LayerImpl to LayerImpl (4)

cc/trees/layer_tree_impl_unittest.cc

 // Copyright 2014 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/trees/layer_tree_impl.h"
 
 #include "cc/layers/heads_up_display_layer_impl.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/solid_color_scrollbar_layer_impl.h"
 #include "cc/test/fake_impl_task_runner_provider.h"
@@ skipping 1200 matching lines @@
 
     position = gfx::PointF(0.f, 40.f);
     bounds = gfx::Size(100, 50);
     SetLayerPropertiesForTesting(grand_child.get(), identity_matrix,
                                  transform_origin, position, bounds, true,
                                  false, false);
     grand_child->SetDrawsContent(true);
     grand_child->SetHasRenderSurface(true);
 
     // This should let |grand_child| "escape" |child|'s clip.
-    grand_child->SetClipParent(root.get());
+    grand_child->test_properties()->clip_parent = root.get();
     std::unique_ptr<std::set<LayerImpl*>> clip_children(
         new std::set<LayerImpl*>);
     clip_children->insert(grand_child.get());
-    root->SetClipChildren(clip_children.release());
+    root->test_properties()->clip_children.reset(clip_children.release());
 
     child->AddChild(std::move(grand_child));
     root->AddChild(std::move(child));
   }
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(std::move(root));
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
   gfx::PointF test_point(12.f, 52.f);
@@ skipping 30 matching lines @@
 
     position = gfx::PointF();
     bounds = gfx::Size(200, 200);
     SetLayerPropertiesForTesting(scroll_child.get(), identity_matrix,
                                  transform_origin, position, bounds, true,
                                  false, false);
     scroll_child->SetDrawsContent(true);
 
     // This should cause scroll child and its descendants to be affected by
     // |child|'s clip.
-    scroll_child->SetScrollParent(child.get());
+    scroll_child->test_properties()->scroll_parent = child.get();
     std::unique_ptr<std::set<LayerImpl*>> scroll_children(
         new std::set<LayerImpl*>);
     scroll_children->insert(scroll_child.get());
-    child->SetScrollChildren(scroll_children.release());
+    child->test_properties()->scroll_children.reset(scroll_children.release());
 
     SetLayerPropertiesForTesting(grand_child.get(), identity_matrix,
                                  transform_origin, position, bounds, true,
                                  false, false);
     grand_child->SetDrawsContent(true);
     grand_child->SetHasRenderSurface(true);
 
     scroll_child->AddChild(std::move(grand_child));
     root->AddChild(std::move(scroll_child));
     root->AddChild(std::move(child));
@@ skipping 1250 matching lines @@
   gfx::PointF test_point = gfx::PointF(1.f, 1.f);
   LayerImpl* result_layer =
       host_impl().active_tree()->FindLayerThatIsHitByPoint(test_point);
 
   CHECK(result_layer);
   EXPECT_EQ(2, result_layer->id());
 }
 
 }  // namespace
 }  // namespace cc