Setup LayerTree class, refactor 2 functions from LayerTreeHost to it.

cc/layers/layer_proto_converter_unittest.cc

 // Copyright 2015 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_proto_converter.h"
 
 #include "cc/layers/empty_content_layer_client.h"
 #include "cc/layers/heads_up_display_layer.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/picture_layer.h"
@@ skipping 185 matching lines @@
   layer_src_a->AddChild(layer_src_c);
   layer_src_b->AddChild(layer_src_d);
   layer_src_b->SetMaskLayer(layer_src_b_mask.get());
   layer_src_b->SetReplicaLayer(layer_src_b_replica.get());
 
   proto::LayerUpdate layer_update;
   LayerProtoConverter::SerializeLayerProperties(
       layer_src_root->layer_tree_host(), &layer_update);
 
   // All flags for pushing properties should have been cleared.
+  EXPECT_FALSE(layer_src_root->layer_tree_host()
+                   ->GetLayerTree()
+                   ->LayerNeedsPushPropertiesForTesting(layer_src_root.get()));
+  EXPECT_FALSE(layer_src_a->layer_tree_host()
+                   ->GetLayerTree()
+                   ->LayerNeedsPushPropertiesForTesting(layer_src_a.get()));
+  EXPECT_FALSE(layer_src_b->layer_tree_host()
+                   ->GetLayerTree()
+                   ->LayerNeedsPushPropertiesForTesting(layer_src_b.get()));
   EXPECT_FALSE(
-      layer_src_root->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
-          layer_src_root.get()));
-  EXPECT_FALSE(
-      layer_src_a->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
-          layer_src_a.get()));
-  EXPECT_FALSE(
-      layer_src_b->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
-          layer_src_b.get()));
-  EXPECT_FALSE(
-      layer_src_b_mask->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
-          layer_src_b_mask.get()));
+      layer_src_b_mask->layer_tree_host()
+          ->GetLayerTree()
+          ->LayerNeedsPushPropertiesForTesting(layer_src_b_mask.get()));
   EXPECT_FALSE(
       layer_src_b_replica->layer_tree_host()
+          ->GetLayerTree()
           ->LayerNeedsPushPropertiesForTesting(layer_src_b_replica.get()));
-  EXPECT_FALSE(
-      layer_src_c->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
-          layer_src_c.get()));
-  EXPECT_FALSE(
-      layer_src_d->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
-          layer_src_d.get()));
+  EXPECT_FALSE(layer_src_c->layer_tree_host()
+                   ->GetLayerTree()
+                   ->LayerNeedsPushPropertiesForTesting(layer_src_c.get()));
+  EXPECT_FALSE(layer_src_d->layer_tree_host()
+                   ->GetLayerTree()
+                   ->LayerNeedsPushPropertiesForTesting(layer_src_d.get()));
 
   // All layers needs to push properties as their layer tree host changed.
   ASSERT_EQ(7, layer_update.layers_size());
   layer_update.Clear();
 
   std::unordered_set<int> dirty_layer_ids;
   layer_src_a->SetNeedsPushProperties();
   dirty_layer_ids.insert(layer_src_a->id());
   layer_src_b->SetNeedsPushProperties();
   dirty_layer_ids.insert(layer_src_b->id());
   layer_src_b_mask->SetNeedsPushProperties();
   dirty_layer_ids.insert(layer_src_b_mask->id());
   layer_src_d->SetNeedsPushProperties();
   dirty_layer_ids.insert(layer_src_d->id());
 
   LayerProtoConverter::SerializeLayerProperties(
       layer_src_root->layer_tree_host(), &layer_update);
 
   // All flags for pushing properties should have been cleared.
+  EXPECT_FALSE(layer_src_root->layer_tree_host()
+                   ->GetLayerTree()
+                   ->LayerNeedsPushPropertiesForTesting(layer_src_root.get()));
+  EXPECT_FALSE(layer_src_a->layer_tree_host()
+                   ->GetLayerTree()
+                   ->LayerNeedsPushPropertiesForTesting(layer_src_a.get()));
+  EXPECT_FALSE(layer_src_b->layer_tree_host()
+                   ->GetLayerTree()
+                   ->LayerNeedsPushPropertiesForTesting(layer_src_b.get()));
   EXPECT_FALSE(
-      layer_src_root->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
-          layer_src_root.get()));
-  EXPECT_FALSE(
-      layer_src_a->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
-          layer_src_a.get()));
-  EXPECT_FALSE(
-      layer_src_b->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
-          layer_src_b.get()));
-  EXPECT_FALSE(
-      layer_src_b_mask->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
-          layer_src_b_mask.get()));
+      layer_src_b_mask->layer_tree_host()
+          ->GetLayerTree()
+          ->LayerNeedsPushPropertiesForTesting(layer_src_b_mask.get()));
   EXPECT_FALSE(
       layer_src_b_replica->layer_tree_host()
+          ->GetLayerTree()
           ->LayerNeedsPushPropertiesForTesting(layer_src_b_replica.get()));
-  EXPECT_FALSE(
-      layer_src_c->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
-          layer_src_c.get()));
-  EXPECT_FALSE(
-      layer_src_d->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
-          layer_src_d.get()));
+  EXPECT_FALSE(layer_src_c->layer_tree_host()
+                   ->GetLayerTree()
+                   ->LayerNeedsPushPropertiesForTesting(layer_src_c.get()));
+  EXPECT_FALSE(layer_src_d->layer_tree_host()
+                   ->GetLayerTree()
+                   ->LayerNeedsPushPropertiesForTesting(layer_src_d.get()));
 
   // Only 4 of the layers should have been serialized.
   ASSERT_EQ(4, layer_update.layers_size());
   for (int index = 0; index < layer_update.layers_size(); index++)
     EXPECT_NE(dirty_layer_ids.find(layer_update.layers(index).id()),
               dirty_layer_ids.end());
   layer_src_root->SetLayerTreeHost(nullptr);
 }
 
 TEST_F(LayerProtoConverterTest, RecursivePropertiesSerializationSingleChild) {
@@ skipping 26 matching lines @@
   std::unordered_set<int> dirty_layer_ids;
   layer_src_b->SetNeedsPushProperties();
   dirty_layer_ids.insert(layer_src_b->id());
   layer_src_b_mask->SetNeedsPushProperties();
   dirty_layer_ids.insert(layer_src_b_mask->id());
 
   LayerProtoConverter::SerializeLayerProperties(
       layer_src_root->layer_tree_host(), &layer_update);
 
   // All flags for pushing properties should have been cleared.
+  EXPECT_FALSE(layer_src_root->layer_tree_host()
+                   ->GetLayerTree()
+                   ->LayerNeedsPushPropertiesForTesting(layer_src_root.get()));
+  EXPECT_FALSE(layer_src_b->layer_tree_host()
+                   ->GetLayerTree()
+                   ->LayerNeedsPushPropertiesForTesting(layer_src_b.get()));
   EXPECT_FALSE(
-      layer_src_root->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
-          layer_src_root.get()));
-  EXPECT_FALSE(
-      layer_src_b->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
-          layer_src_b.get()));
-  EXPECT_FALSE(
-      layer_src_b_mask->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
-          layer_src_b_mask.get()));
-  EXPECT_FALSE(
-      layer_src_c->layer_tree_host()->LayerNeedsPushPropertiesForTesting(
-          layer_src_c.get()));
+      layer_src_b_mask->layer_tree_host()
+          ->GetLayerTree()
+          ->LayerNeedsPushPropertiesForTesting(layer_src_b_mask.get()));
+  EXPECT_FALSE(layer_src_c->layer_tree_host()
+                   ->GetLayerTree()
+                   ->LayerNeedsPushPropertiesForTesting(layer_src_c.get()));
 
   // Only 2 of the layers should have been serialized.
   ASSERT_EQ(2, layer_update.layers_size());
   for (int index = 0; index < layer_update.layers_size(); index++)
     EXPECT_NE(dirty_layer_ids.find(layer_update.layers(index).id()),
               dirty_layer_ids.end());
   layer_src_root->SetLayerTreeHost(nullptr);
 }
 
 TEST_F(LayerProtoConverterTest, PictureLayerTypeSerialization) {
@@ skipping 61 matching lines @@
   // serialize to.
   proto::LayerNode layer_node;
   new_root->SetTypeForProtoSerialization(&layer_node);
   EXPECT_EQ(proto::LayerNode::HEADS_UP_DISPLAY_LAYER, layer_node.type());
 
   new_root->SetLayerTreeHost(nullptr);
 }
 
 }  // namespace
 }  // namespace cc