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

cc/trees/layer_tree_host_unittest_serialization.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/trees/layer_tree_host.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "cc/layers/empty_content_layer_client.h"
 #include "cc/layers/heads_up_display_layer.h"
 #include "cc/layers/layer.h"
 #include "cc/proto/layer.pb.h"
 #include "cc/proto/layer_tree_host.pb.h"
 #include "cc/test/fake_image_serialization_processor.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_picture_layer.h"
 #include "cc/test/fake_recording_source.h"
 #include "cc/test/layer_tree_test.h"
 #include "cc/test/skia_common.h"
 #include "cc/test/test_task_graph_runner.h"
+#include "cc/trees/layer_tree.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/vector2d_f.h"
 
 namespace cc {
 
@@ skipping 42 matching lines @@
         CompositorMode::SINGLE_THREADED, image_serialization_processor_.get());
     layer_tree_host_dst_ = FakeLayerTreeHost::Create(
         &client_dst_, &task_graph_runner_dst_, settings,
         CompositorMode::SINGLE_THREADED, image_serialization_processor_.get());
     layer_tree_host_src_->InitializePictureCacheForTesting();
     layer_tree_host_dst_->InitializePictureCacheForTesting();
   }
 
   void TearDown() override {
     // Need to reset |in_paint_layer_contents_| to tear down.
-    layer_tree_host_src_->in_paint_layer_contents_ = false;
-    layer_tree_host_dst_->in_paint_layer_contents_ = false;
+
+    layer_tree_host_src_->GetLayerTree()->in_paint_layer_contents_ = false;
+    layer_tree_host_dst_->GetLayerTree()->in_paint_layer_contents_ = false;
 
     // Need to reset LayerTreeHost pointers before tear down.
     layer_tree_host_src_ = nullptr;
     layer_tree_host_dst_ = nullptr;
   }
 
   void VerifyHostHasAllExpectedLayersInTree(Layer* root_layer) {
     LayerTreeHostCommon::CallFunctionForEveryLayer(
         root_layer->layer_tree_host(), [root_layer](Layer* layer) {
           DCHECK(layer->layer_tree_host());
           EXPECT_EQ(layer, layer->layer_tree_host()->LayerById(layer->id()));
         });
   }
 
   void VerifySerializationAndDeserialization() {
     proto::LayerTreeHost proto;
+    LayerTree* layer_tree_src = layer_tree_host_src_->GetLayerTree();
+    LayerTree* layer_tree_dst = layer_tree_host_dst_->GetLayerTree();
 
     std::unordered_set<Layer*> layers_that_should_push_properties_src =
-        layer_tree_host_src_->LayersThatShouldPushProperties();
+        layer_tree_src->LayersThatShouldPushProperties();
     std::vector<std::unique_ptr<SwapPromise>> swap_promises;
     layer_tree_host_src_->ToProtobufForCommit(&proto, &swap_promises);
     layer_tree_host_dst_->FromProtobufForCommit(proto);
 
     EXPECT_EQ(layer_tree_host_src_->needs_full_tree_sync_,
               layer_tree_host_dst_->needs_full_tree_sync_);
     EXPECT_EQ(layer_tree_host_src_->needs_meta_info_recomputation_,
               layer_tree_host_dst_->needs_meta_info_recomputation_);
     EXPECT_EQ(layer_tree_host_src_->source_frame_number_,
               layer_tree_host_dst_->source_frame_number_);
@@ skipping 27 matching lines @@
     EXPECT_EQ(layer_tree_host_src_->elastic_overscroll_,
               layer_tree_host_dst_->elastic_overscroll_);
     EXPECT_EQ(layer_tree_host_src_->has_gpu_rasterization_trigger_,
               layer_tree_host_dst_->has_gpu_rasterization_trigger_);
     EXPECT_EQ(layer_tree_host_src_->content_is_suitable_for_gpu_rasterization_,
               layer_tree_host_dst_->content_is_suitable_for_gpu_rasterization_);
     EXPECT_EQ(layer_tree_host_src_->background_color_,
               layer_tree_host_dst_->background_color_);
     EXPECT_EQ(layer_tree_host_src_->has_transparent_background_,
               layer_tree_host_dst_->has_transparent_background_);
-    EXPECT_EQ(layer_tree_host_src_->in_paint_layer_contents_,
-              layer_tree_host_dst_->in_paint_layer_contents_);
+    EXPECT_EQ(layer_tree_src->in_paint_layer_contents(),
+              layer_tree_dst->in_paint_layer_contents());
     EXPECT_EQ(layer_tree_host_src_->id_, layer_tree_host_dst_->id_);
     EXPECT_EQ(layer_tree_host_src_->next_commit_forces_redraw_,
               layer_tree_host_dst_->next_commit_forces_redraw_);
     for (auto* layer : layers_that_should_push_properties_src) {
-      EXPECT_TRUE(layer_tree_host_dst_->LayerNeedsPushPropertiesForTesting(
-          layer_tree_host_dst_->LayerById(layer->id())));
+      EXPECT_TRUE(layer_tree_dst->LayerNeedsPushPropertiesForTesting(
+          layer_tree_dst->LayerById(layer->id())));
     }
 
     if (layer_tree_host_src_->hud_layer_) {
       EXPECT_EQ(layer_tree_host_src_->hud_layer_->id(),
                 layer_tree_host_dst_->hud_layer_->id());
       // The HUD layer member is a HeadsUpDisplayLayer instead of Layer, so
       // inspect the proto to see if it contains the the right layer type.
       bool found_hud_layer_type = false;
       for (int i = 0; i < proto.root_layer().children_size(); ++i) {
         if (proto.root_layer().children(i).id() ==
@@ skipping 104 matching lines @@
     root_layer_src->AddChild(layer_tree_host_src_->page_scale_layer_);
     layer_tree_host_src_->inner_viewport_scroll_layer_ = Layer::Create();
     root_layer_src->AddChild(
         layer_tree_host_src_->inner_viewport_scroll_layer_);
     layer_tree_host_src_->outer_viewport_scroll_layer_ = Layer::Create();
     root_layer_src->AddChild(
         layer_tree_host_src_->outer_viewport_scroll_layer_);
 
     // Set in_paint_layer_contents_ only after all calls to AddChild() have
     // finished to ensure it's allowed to do so at that time.
-    layer_tree_host_src_->in_paint_layer_contents_ =
-        !layer_tree_host_src_->in_paint_layer_contents_;
+    LayerTree* layer_tree_src = layer_tree_host_src_->GetLayerTree();
+    layer_tree_src->in_paint_layer_contents_ =
+        !layer_tree_src->in_paint_layer_contents();
 
     LayerSelectionBound sel_bound;
     sel_bound.edge_top = gfx::Point(14, 3);
     LayerSelection selection;
     selection.start = sel_bound;
     layer_tree_host_src_->selection_ = selection;
 
     layer_tree_host_src_->property_trees_.sequence_number =
         layer_tree_host_src_->property_trees_.sequence_number * 3 + 1;
 
@@ skipping 151 matching lines @@
 
 TEST_F(LayerTreeHostSerializationTest, AddAndRemoveNodeFromLayerTree) {
   RunAddAndRemoveNodeFromLayerTree();
 }
 
 TEST_F(LayerTreeHostSerializationTest, PictureLayerMultipleSerializations) {
   RunPictureLayerMultipleSerializationsTest();
 }
 
 }  // namespace cc