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

cc/layers/layer_impl_test_properties.h

Index: cc/layers/layer_impl_test_properties.h
diff --git a/cc/layers/layer_impl_test_properties.h b/cc/layers/layer_impl_test_properties.h
index cc4cff41388c50b8579fe00b862468526b70f371..1bcb460e5981956059cf6e7ab9936ae7144f53f0 100644
--- a/cc/layers/layer_impl_test_properties.h
+++ b/cc/layers/layer_impl_test_properties.h
@@ -5,20 +5,33 @@
 #ifndef CC_LAYERS_LAYER_IMPL_TEST_PROPERTIES_H_
 #define CC_LAYERS_LAYER_IMPL_TEST_PROPERTIES_H_
 
+#include <set>
+
+#include "base/memory/ptr_util.h"
 #include "cc/layers/layer_position_constraint.h"
 #include "ui/gfx/geometry/point3_f.h"
 
 namespace cc {
 
-struct LayerImplTestProperties {
-  bool double_sided = true;
-  bool force_render_surface = false;
-  bool is_container_for_fixed_position_layers = false;
-  bool should_flatten_transform = true;
-  int num_descendants_that_draw_content = 0;
+class LayerImpl;
+
+struct CC_EXPORT LayerImplTestProperties {
+  LayerImplTestProperties();
+  ~LayerImplTestProperties();
+
+  bool double_sided;
+  bool force_render_surface;
+  bool is_container_for_fixed_position_layers;
+  bool should_flatten_transform;
+  int num_descendants_that_draw_content;
   LayerPositionConstraint position_constraint;
   gfx::Point3F transform_origin;
+  LayerImpl* scroll_parent;
+  std::unique_ptr<std::set<LayerImpl*>> scroll_children;
+  LayerImpl* clip_parent;
+  std::unique_ptr<std::set<LayerImpl*>> clip_children;
 };
 
 }  // namespace cc
+
 #endif  // CC_LAYERS_LAYER_IMPL_TEST_PROPERTIES_H_