cc: Reland Move data to LayerTree from LayerTreeHost.

cc/trees/layer_tree_host_perftest.cc

Index: cc/trees/layer_tree_host_perftest.cc
diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc
index acf6457ee28f82787b9f5637fa6394046378afe0..edf1213e0260976a36c8610598ade64a2038b57d 100644
--- a/cc/trees/layer_tree_host_perftest.cc
+++ b/cc/trees/layer_tree_host_perftest.cc
@@ -135,11 +135,11 @@ class LayerTreeHostPerfTestJsonReader : public LayerTreeHostPerfTest {
 
   void BuildTree() override {
     gfx::Size viewport = gfx::Size(720, 1038);
-    layer_tree_host()->SetViewportSize(viewport);
+    layer_tree()->SetViewportSize(viewport);
     scoped_refptr<Layer> root = ParseTreeFromJson(json_,
                                                   &fake_content_layer_client_);
     ASSERT_TRUE(root.get());
-    layer_tree_host()->SetRootLayer(root);
+    layer_tree()->SetRootLayer(root);
     fake_content_layer_client_.set_bounds(viewport);
   }
 
@@ -184,7 +184,7 @@ class LayerTreeHostPerfTestLeafInvalidates
     LayerTreeHostPerfTestJsonReader::BuildTree();
 
     // Find a leaf layer.
-    for (layer_to_invalidate_ = layer_tree_host()->root_layer();
+    for (layer_to_invalidate_ = layer_tree()->root_layer();
          layer_to_invalidate_->children().size();
          layer_to_invalidate_ = layer_to_invalidate_->children()[0].get()) {
     }
@@ -225,7 +225,7 @@ class ScrollingLayerTreePerfTest : public LayerTreeHostPerfTestJsonReader {
 
   void BuildTree() override {
     LayerTreeHostPerfTestJsonReader::BuildTree();
-    scrollable_ = layer_tree_host()->root_layer()->children()[1];
+    scrollable_ = layer_tree()->root_layer()->children()[1];
     ASSERT_TRUE(scrollable_.get());
   }
 
@@ -261,12 +261,13 @@ class BrowserCompositorInvalidateLayerTreePerfTest
 
   void BuildTree() override {
     LayerTreeHostPerfTestJsonReader::BuildTree();
-    tab_contents_ =
-        static_cast<TextureLayer*>(
-            layer_tree_host()->root_layer()->children()[0]->
-                                             children()[0]->
-                                             children()[0]->
-                                             children()[0].get());
+    tab_contents_ = static_cast<TextureLayer*>(layer_tree()
+                                                   ->root_layer()
+                                                   ->children()[0]
+                                                   ->children()[0]
+                                                   ->children()[0]
+                                                   ->children()[0]
+                                                   .get());
     ASSERT_TRUE(tab_contents_.get());
   }