cc: Merge LayerTree into the LayerTreeHost.

cc/trees/layer_tree_host_unittest_context.cc

Index: cc/trees/layer_tree_host_unittest_context.cc
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
index 3a2187e93a4c8cbe4faf3cbb61d3c8e3fcd75a5a..e73d79e2d19b03d0c267dc7f0de81a1bf5e20541 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -222,7 +222,7 @@ class LayerTreeHostContextTestLostContextSucceeds
 
   virtual void InvalidateAndSetNeedsCommit() {
     // Cause damage so we try to draw.
-    layer_tree()->root_layer()->SetNeedsDisplay();
+    layer_tree_host()->root_layer()->SetNeedsDisplay();
     layer_tree_host()->SetNeedsCommit();
   }
 
@@ -619,7 +619,7 @@ class LayerTreeHostContextTestLostContextSucceedsWithContent
 
     root_->AddChild(layer_);
 
-    layer_tree()->SetRootLayer(root_);
+    layer_tree_host()->SetRootLayer(root_);
     LayerTreeHostContextTest::SetupTree();
     client_.set_bounds(root_->bounds());
   }
@@ -696,7 +696,7 @@ class LayerTreeHostContextTestLostContextAndEvictTextures
         FakePictureLayer::Create(&client_);
     picture_layer->SetBounds(gfx::Size(10, 20));
     client_.set_bounds(picture_layer->bounds());
-    layer_tree()->SetRootLayer(picture_layer);
+    layer_tree_host()->SetRootLayer(picture_layer);
 
     LayerTreeHostContextTest::SetupTree();
   }
@@ -804,7 +804,7 @@ class LayerTreeHostContextTestLayersNotified : public LayerTreeHostContextTest {
     root_->AddChild(child_);
     child_->AddChild(grandchild_);
 
-    layer_tree()->SetRootLayer(root_);
+    layer_tree_host()->SetRootLayer(root_);
     LayerTreeHostContextTest::SetupTree();
     client_.set_bounds(root_->bounds());
   }
@@ -975,7 +975,7 @@ class LayerTreeHostContextTestDontUseLostResources
     scrollbar->SetIsDrawable(true);
     root->AddChild(scrollbar);
 
-    layer_tree()->SetRootLayer(root);
+    layer_tree_host()->SetRootLayer(root);
     LayerTreeHostContextTest::SetupTree();
   }
 
@@ -1015,10 +1015,10 @@ class LayerTreeHostContextTestDontUseLostResources
   }
 
   void DidCommitAndDrawFrame() override {
-    ASSERT_TRUE(layer_tree()->hud_layer());
+    ASSERT_TRUE(layer_tree_host()->hud_layer());
     // End the test once we know the 3nd frame drew.
     if (layer_tree_host()->SourceFrameNumber() < 5) {
-      layer_tree()->root_layer()->SetNeedsDisplay();
+      layer_tree_host()->root_layer()->SetNeedsDisplay();
       layer_tree_host()->SetNeedsCommit();
     } else {
       EndTest();
@@ -1060,7 +1060,7 @@ class LayerTreeHostContextTestImplSidePainting
     picture->SetIsDrawable(true);
     root->AddChild(picture);
 
-    layer_tree()->SetRootLayer(root);
+    layer_tree_host()->SetRootLayer(root);
     LayerTreeHostContextTest::SetupTree();
   }
 
@@ -1088,8 +1088,8 @@ class ScrollbarLayerLostContext : public LayerTreeHostContextTest {
     scrollbar_layer_ =
         FakePaintedScrollbarLayer::Create(false, true, scroll_layer->id());
     scrollbar_layer_->SetBounds(gfx::Size(10, 100));
-    layer_tree()->root_layer()->AddChild(scrollbar_layer_);
-    layer_tree()->root_layer()->AddChild(scroll_layer);
+    layer_tree_host()->root_layer()->AddChild(scrollbar_layer_);
+    layer_tree_host()->root_layer()->AddChild(scroll_layer);
     PostSetNeedsCommitToMainThread();
   }
 
@@ -1610,7 +1610,7 @@ class LayerTreeHostContextTestLoseWorkerContextDuringPrepareTiles
         FakePictureLayer::Create(&client_);
     picture_layer->SetBounds(gfx::Size(10, 20));
     client_.set_bounds(picture_layer->bounds());
-    layer_tree()->SetRootLayer(picture_layer);
+    layer_tree_host()->SetRootLayer(picture_layer);
 
     LayerTreeTest::SetupTree();
   }