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

cc/trees/layer_tree_host_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/trees/layer_tree_host_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 1995 matching lines @@
       LayerImpl::Create(host_impl_->active_tree(), 8);
   std::unique_ptr<LayerImpl> scroll_child =
       CreateScrollableLayer(9, gfx::Size(10, 10), scroll_child_clip.get());
   child = scroll_child.get();
   scroll_child->SetPosition(gfx::PointF(20.f, 20.f));
   scroll_child_clip->AddChild(std::move(scroll_child));
 
   child_clip = scroll_child_clip.get();
   viewport_scroll->AddChild(std::move(scroll_child_clip));
 
-  child_clip->SetScrollParent(parent);
+  child_clip->test_properties()->scroll_parent = parent;
   std::unique_ptr<std::set<LayerImpl*>> scroll_children(
       new std::set<LayerImpl*>);
   scroll_children->insert(child_clip);
-  parent->SetScrollChildren(scroll_children.release());
+  parent->test_properties()->scroll_children.reset(scroll_children.release());
 
   SetNeedsRebuildPropertyTrees();
   DrawFrame();
 
   {
     host_impl_->ScrollBegin(BeginState(gfx::Point(21, 21)).get(),
                             InputHandler::TOUCHSCREEN);
     host_impl_->ScrollBy(
         UpdateState(gfx::Point(21, 21), gfx::Vector2d(5, 5)).get());
     host_impl_->ScrollBy(
@@ skipping 6140 matching lines @@
       CreateScrollableLayer(invisible_scroll_layer_id, content_size, root);
   invisible_scroll->SetDrawsContent(false);
 
   int container_id = 8;
   std::unique_ptr<LayerImpl> container =
       LayerImpl::Create(host_impl_->active_tree(), container_id);
 
   std::unique_ptr<std::set<LayerImpl*>> scroll_children(
       new std::set<LayerImpl*>);
   scroll_children->insert(scroll_child.get());
-  invisible_scroll->SetScrollChildren(scroll_children.release());
+  invisible_scroll->test_properties()->scroll_children.reset(
+      scroll_children.release());
 
-  scroll_child->SetScrollParent(invisible_scroll.get());
+  scroll_child->test_properties()->scroll_parent = invisible_scroll.get();
 
   container->AddChild(std::move(invisible_scroll));
   container->AddChild(std::move(scroll_child));
 
   scroll_layer->AddChild(std::move(container));
 
   SetNeedsRebuildPropertyTrees();
   DrawFrame();
 
   // We should have scrolled |child_scroll| even though it is invisible.
@@ skipping 2485 matching lines @@
     // There should not be any jitter measured till we hit the fixed point hits
     // threshold.
     float expected_jitter =
         (i == pending_tree->kFixedPointHitsThreshold) ? 500 : 0;
     EXPECT_EQ(jitter, expected_jitter);
   }
 }
 
 }  // namespace
 }  // namespace cc