cc: Reland Move data to LayerTree from LayerTreeHost.

cc/layers/surface_layer_unittest.cc

Index: cc/layers/surface_layer_unittest.cc
diff --git a/cc/layers/surface_layer_unittest.cc b/cc/layers/surface_layer_unittest.cc
index 0597cd76ddafba2845936fcaed9ad7d268867e16..31caccc9ade0ec9a6a3d2f5b7f3825abb796ce51 100644
--- a/cc/layers/surface_layer_unittest.cc
+++ b/cc/layers/surface_layer_unittest.cc
@@ -33,12 +33,13 @@ class SurfaceLayerTest : public testing::Test {
   void SetUp() override {
     layer_tree_host_ =
         FakeLayerTreeHost::Create(&fake_client_, &task_graph_runner_);
-    layer_tree_host_->SetViewportSize(gfx::Size(10, 10));
+    layer_tree_ = layer_tree_host_->GetLayerTree();
+    layer_tree_->SetViewportSize(gfx::Size(10, 10));
   }
 
   void TearDown() override {
     if (layer_tree_host_) {
-      layer_tree_host_->SetRootLayer(nullptr);
+      layer_tree_->SetRootLayer(nullptr);
       layer_tree_host_ = nullptr;
     }
   }
@@ -46,6 +47,7 @@ class SurfaceLayerTest : public testing::Test {
   FakeLayerTreeHostClient fake_client_;
   TestTaskGraphRunner task_graph_runner_;
   std::unique_ptr<FakeLayerTreeHost> layer_tree_host_;
+  LayerTree* layer_tree_;
 };
 
 void SatisfyCallback(SurfaceSequence* out, const SurfaceSequence& in) {
@@ -73,7 +75,7 @@ TEST_F(SurfaceLayerTest, MultipleFramesOneSurface) {
   layer->SetSurfaceId(SurfaceId(kArbitraryClientId, 1, 0), 1.f,
                       gfx::Size(1, 1));
   layer_tree_host_->set_surface_client_id(1);
-  layer_tree_host_->SetRootLayer(layer);
+  layer_tree_->SetRootLayer(layer);
 
   std::unique_ptr<FakeLayerTreeHost> layer_tree_host2 =
       FakeLayerTreeHost::Create(&fake_client_, &task_graph_runner_);
@@ -105,7 +107,7 @@ TEST_F(SurfaceLayerTest, MultipleFramesOneSurface) {
   EXPECT_TRUE(required_seq.count(expected1));
   EXPECT_TRUE(required_seq.count(expected2));
 
-  layer_tree_host_->SetRootLayer(nullptr);
+  layer_tree_->SetRootLayer(nullptr);
   layer_tree_host_.reset();
 
   // Layer was removed so sequence from first LayerTreeHost should be
@@ -134,7 +136,7 @@ class SurfaceLayerSwapPromise : public LayerTreeTest {
     // Layer hasn't been added to tree so no SurfaceSequence generated yet.
     EXPECT_EQ(0u, required_set_.size());
 
-    layer_tree_host()->SetRootLayer(layer_);
+    layer_tree()->SetRootLayer(layer_);
 
     // Should have SurfaceSequence from first tree.
     SurfaceSequence expected(1u, 1u);
@@ -143,7 +145,7 @@ class SurfaceLayerSwapPromise : public LayerTreeTest {
     EXPECT_TRUE(required_set_.count(expected));
 
     gfx::Size bounds(100, 100);
-    layer_tree_host()->SetViewportSize(bounds);
+    layer_tree()->SetViewportSize(bounds);
 
     blank_layer_ = SolidColorLayer::Create();
     blank_layer_->SetIsDrawable(true);
@@ -179,7 +181,7 @@ class SurfaceLayerSwapPromiseWithDraw : public SurfaceLayerSwapPromise {
     switch (commit_count_) {
       case 1:
         // Remove SurfaceLayer from tree to cause SwapPromise to be created.
-        layer_tree_host()->SetRootLayer(blank_layer_);
+        layer_tree()->SetRootLayer(blank_layer_);
         break;
       case 2:
         break;
@@ -232,7 +234,7 @@ class SurfaceLayerSwapPromiseWithoutDraw : public SurfaceLayerSwapPromise {
     switch (commit_count_) {
       case 1:
         // Remove SurfaceLayer from tree to cause SwapPromise to be created.
-        layer_tree_host()->SetRootLayer(blank_layer_);
+        layer_tree()->SetRootLayer(blank_layer_);
         break;
       case 2:
         layer_tree_host()->SetNeedsCommit();