cc: Reland Move data to LayerTree from LayerTreeHost.

cc/trees/layer_tree_host_pixeltest_readback.cc

 // Copyright 2013 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 "build/build_config.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/texture_layer.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/test/fake_picture_layer.h"
@@ skipping 71 matching lines @@
     }
 
     if (!copy_subrect_.IsEmpty())
       request->set_area(copy_subrect_);
     return request;
   }
 
   void BeginTest() override {
     if (insert_copy_request_after_frame_count_ == 0) {
       Layer* const target =
-          readback_target_ ? readback_target_ : layer_tree_host()->root_layer();
+          readback_target_ ? readback_target_ : layer_tree()->root_layer();
       target->RequestCopyOfOutput(CreateCopyOutputRequest());
     }
     PostSetNeedsCommitToMainThread();
   }
 
   void DidCommitAndDrawFrame() override {
     if (insert_copy_request_after_frame_count_ ==
         layer_tree_host()->source_frame_number()) {
       Layer* const target =
-          readback_target_ ? readback_target_ : layer_tree_host()->root_layer();
+          readback_target_ ? readback_target_ : layer_tree()->root_layer();
       target->RequestCopyOfOutput(CreateCopyOutputRequest());
     }
   }
 
   void ReadbackResultAsBitmap(std::unique_ptr<CopyOutputResult> result) {
     EXPECT_TRUE(task_runner_provider()->IsMainThread());
     EXPECT_TRUE(result->HasBitmap());
     result_bitmap_ = result->TakeBitmap();
     EndTest();
   }
@@ skipping 348 matching lines @@
         white_client_(SK_ColorWHITE, gfx::Size(200, 200)),
         green_client_(SK_ColorGREEN, gfx::Size(200, 200)),
         blue_client_(SK_ColorBLUE, gfx::Size(200, 200)) {}
 
   void InitializeSettings(LayerTreeSettings* settings) override {
     // Cause the device scale factor to be inherited by contents scales.
     settings->layer_transforms_should_scale_layer_contents = true;
   }
 
   void SetupTree() override {
-    layer_tree_host()->SetDeviceScaleFactor(device_scale_factor_);
+    layer_tree()->SetDeviceScaleFactor(device_scale_factor_);
     LayerTreePixelTest::SetupTree();
   }
 
   void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
     EXPECT_EQ(device_scale_factor_,
               host_impl->active_tree()->device_scale_factor());
   }
 
   float device_scale_factor_;
   SolidColorContentLayerClient white_client_;
@@ skipping 65 matching lines @@
                            READBACK_DEFAULT),
         ReadbackTestConfig(LayerTreeHostReadbackPixelTest::PIXEL_TEST_GL,
                            READBACK_DEFAULT),
         ReadbackTestConfig(LayerTreeHostReadbackPixelTest::PIXEL_TEST_GL,
                            READBACK_BITMAP)));
 
 }  // namespace
 }  // namespace cc
 
 #endif  // OS_ANDROID