cc: Merge LayerTree into the LayerTreeHost.

cc/trees/layer_tree_host_unittest_picture.cc

Index: cc/trees/layer_tree_host_unittest_picture.cc
diff --git a/cc/trees/layer_tree_host_unittest_picture.cc b/cc/trees/layer_tree_host_unittest_picture.cc
index bb13a32b06e8f9435189e513b23655e71fd108a6..cbdd64173b992ac97242a338b057a72620366e81 100644
--- a/cc/trees/layer_tree_host_unittest_picture.cc
+++ b/cc/trees/layer_tree_host_unittest_picture.cc
@@ -24,7 +24,7 @@ class LayerTreeHostPictureTest : public LayerTreeTest {
     root_picture_layer_->SetBounds(size);
     root->AddChild(root_picture_layer_);
 
-    layer_tree()->SetRootLayer(root);
+    layer_tree_host()->SetRootLayer(root);
     client_.set_bounds(size);
   }
 
@@ -62,7 +62,7 @@ class LayerTreeHostPictureTestTwinLayer
         scoped_refptr<FakePictureLayer> picture =
             FakePictureLayer::Create(&client_);
         picture_id2_ = picture->id();
-        layer_tree()->root_layer()->AddChild(picture);
+        layer_tree_host()->root_layer()->AddChild(picture);
         break;
       }
       case 4:
@@ -158,7 +158,7 @@ class LayerTreeHostPictureTestResizeViewportWithGpuRaster
     picture_->SetBounds(gfx::Size(768, 960));
     root->AddChild(picture_);
 
-    layer_tree()->SetRootLayer(root);
+    layer_tree_host()->SetRootLayer(root);
     LayerTreeHostPictureTest::SetupTree();
   }
 
@@ -190,7 +190,7 @@ class LayerTreeHostPictureTestResizeViewportWithGpuRaster
         // Change the picture layer's size along with the viewport, so it will
         // consider picking a new tile size.
         picture_->SetBounds(gfx::Size(768, 1056));
-        layer_tree()->SetViewportSize(gfx::Size(768, 1056));
+        layer_tree_host()->SetViewportSize(gfx::Size(768, 1056));
         break;
       case 2:
         EndTest();
@@ -226,7 +226,7 @@ class LayerTreeHostPictureTestChangeLiveTilesRectWithRecycleTree
     // force it to have a transform node by making it scrollable.
     picture_->SetScrollClipLayerId(root->id());
 
-    layer_tree()->SetRootLayer(root);
+    layer_tree_host()->SetRootLayer(root);
     LayerTreeHostPictureTest::SetupTree();
     client_.set_bounds(picture_->bounds());
   }
@@ -338,7 +338,7 @@ class LayerTreeHostPictureTestRSLLMembership : public LayerTreeHostPictureTest {
     picture_->SetBounds(gfx::Size(100, 100));
     child_->AddChild(picture_);
 
-    layer_tree()->SetRootLayer(root);
+    layer_tree_host()->SetRootLayer(root);
     LayerTreeHostPictureTest::SetupTree();
   }
 
@@ -429,10 +429,10 @@ class LayerTreeHostPictureTestRSLLMembershipWithScale
     picture_->SetBounds(gfx::Size(100, 100));
     pinch_->AddChild(picture_);
 
-    layer_tree()->RegisterViewportLayers(NULL, page_scale_layer, pinch_,
-                                         nullptr);
-    layer_tree()->SetPageScaleFactorAndLimits(1.f, 1.f, 4.f);
-    layer_tree()->SetRootLayer(root_clip);
+    layer_tree_host()->RegisterViewportLayers(NULL, page_scale_layer, pinch_,
+                                              nullptr);
+    layer_tree_host()->SetPageScaleFactorAndLimits(1.f, 1.f, 4.f);
+    layer_tree_host()->SetRootLayer(root_clip);
     LayerTreeHostPictureTest::SetupTree();
     client_.set_bounds(picture_->bounds());
   }
@@ -592,8 +592,8 @@ class LayerTreeHostPictureTestForceRecalculateScales
     normal_layer_->SetBounds(size);
     root->AddChild(normal_layer_);
 
-    layer_tree()->SetRootLayer(root);
-    layer_tree()->SetViewportSize(size);
+    layer_tree_host()->SetRootLayer(root);
+    layer_tree_host()->SetViewportSize(size);
 
     client_.set_fill_with_nonsolid_color(true);
     client_.set_bounds(size);
@@ -658,13 +658,13 @@ class LayerTreeHostPictureTestForceRecalculateScales
   void ScaleRootUp() {
     gfx::Transform transform;
     transform.Scale(2, 2);
-    layer_tree_host()->GetLayerTree()->root_layer()->SetTransform(transform);
+    layer_tree_host()->root_layer()->SetTransform(transform);
   }
 
   void ScaleRootUpAndRecalculateScales() {
     gfx::Transform transform;
     transform.Scale(4, 4);
-    layer_tree_host()->GetLayerTree()->root_layer()->SetTransform(transform);
+    layer_tree_host()->root_layer()->SetTransform(transform);
     layer_tree_host()->SetNeedsRecalculateRasterScales();
   }