cc : Move LayerImpl::children to test properties

cc/test/layer_tree_json_parser_unittest.cc

 // Copyright 2013 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/test/layer_tree_json_parser.h"
 
 #include <stddef.h>
 
 #include "cc/layers/layer.h"
 #include "cc/test/fake_impl_task_runner_provider.h"
@@ skipping 10 matching lines @@
 bool LayerTreesMatch(LayerImpl* const layer_impl,
                      Layer* const layer) {
 #define RETURN_IF_EXPECTATION_FAILS(exp) \
   do { \
     exp; \
     if (testing::UnitTest::GetInstance()->current_test_info()-> \
             result()->Failed()) \
       return false; \
   } while (0)
 
-  RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->children().size(),
-                                        layer->children().size()));
+  RETURN_IF_EXPECTATION_FAILS(
+      EXPECT_EQ(layer_impl->test_properties()->children.size(),
+                layer->children().size()));
   RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->bounds(), layer->bounds()));
   RETURN_IF_EXPECTATION_FAILS(
       EXPECT_EQ(layer_impl->position(), layer->position()));
   RETURN_IF_EXPECTATION_FAILS(EXPECT_TRANSFORMATION_MATRIX_EQ(
       layer_impl->transform(), layer->transform()));
   RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->contents_opaque(),
                                         layer->contents_opaque()));
   RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->scrollable(),
                                         layer->scrollable()));
   RETURN_IF_EXPECTATION_FAILS(
       EXPECT_FLOAT_EQ(layer_impl->Opacity(), layer->opacity()));
   RETURN_IF_EXPECTATION_FAILS(
       EXPECT_EQ(layer_impl->touch_event_handler_region(),
                 layer->touch_event_handler_region()));
 
-  for (size_t i = 0; i < layer_impl->children().size(); ++i) {
-    RETURN_IF_EXPECTATION_FAILS(EXPECT_TRUE(LayerTreesMatch(
-        layer_impl->children()[i], layer->children()[i].get())));
+  for (size_t i = 0; i < layer_impl->test_properties()->children.size(); ++i) {
+    RETURN_IF_EXPECTATION_FAILS(
+        EXPECT_TRUE(LayerTreesMatch(layer_impl->test_properties()->children[i],
+                                    layer->children()[i].get())));
   }
 
   return true;
 #undef RETURN_IF_EXPECTATION_FAILS
 }
 
 }  // namespace
 
 class LayerTreeJsonParserSanityCheck : public testing::Test {
 };
@@ skipping 52 matching lines @@
   root_impl->AddChild(std::move(touch_layer));
   tree->SetRootLayer(std::move(root_impl));
 
   std::string json = host_impl.LayerTreeAsJson();
   scoped_refptr<Layer> root = ParseTreeFromJson(json, NULL);
   ASSERT_TRUE(root.get());
   EXPECT_TRUE(LayerTreesMatch(host_impl.RootLayer(), root.get()));
 }
 
 }  // namespace cc