cc: Clean up root_layer code in LTI

cc/test/layer_test_common.h

 // Copyright 2012 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.
 
 #ifndef CC_TEST_LAYER_TEST_COMMON_H_
 #define CC_TEST_LAYER_TEST_COMMON_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 43 matching lines @@
    public:
     LayerImplTest();
     explicit LayerImplTest(const LayerTreeSettings& settings);
     ~LayerImplTest();
 
     template <typename T>
     T* AddChildToRoot() {
       std::unique_ptr<T> layer =
           T::Create(host_->host_impl()->active_tree(), layer_impl_id_++);
       T* ptr = layer.get();
-      root_layer()->test_properties()->AddChild(std::move(layer));
+      root_layer_for_testing()->test_properties()->AddChild(std::move(layer));
       return ptr;
     }
 
     template <typename T>
     T* AddChild(LayerImpl* parent) {
       std::unique_ptr<T> layer =
           T::Create(host_->host_impl()->active_tree(), layer_impl_id_++);
       T* ptr = layer.get();
       parent->test_properties()->AddChild(std::move(layer));
       return ptr;
     }
 
     template <typename T>
     T* AddReplicaLayer(LayerImpl* origin) {
       std::unique_ptr<T> layer =
           T::Create(host_->host_impl()->active_tree(), layer_impl_id_++);
       T* ptr = layer.get();
       origin->test_properties()->SetReplicaLayer(std::move(layer));
       return ptr;
     }
 
     template <typename T, typename A>
     T* AddChildToRoot(const A& a) {
       std::unique_ptr<T> layer =
           T::Create(host_->host_impl()->active_tree(), layer_impl_id_++, a);
       T* ptr = layer.get();
-      root_layer()->test_properties()->AddChild(std::move(layer));
+      root_layer_for_testing()->test_properties()->AddChild(std::move(layer));
       return ptr;
     }
 
     template <typename T, typename A, typename B>
     T* AddChildToRoot(const A& a, const B& b) {
       std::unique_ptr<T> layer =
           T::Create(host_->host_impl()->active_tree(), layer_impl_id_++, a, b);
       T* ptr = layer.get();
-      root_layer()->test_properties()->AddChild(std::move(layer));
+      root_layer_for_testing()->test_properties()->AddChild(std::move(layer));
       return ptr;
     }
 
     template <typename T, typename A, typename B, typename C, typename D>
     T* AddChildToRoot(const A& a, const B& b, const C& c, const D& d) {
       std::unique_ptr<T> layer = T::Create(host_->host_impl()->active_tree(),
                                            layer_impl_id_++, a, b, c, d);
       T* ptr = layer.get();
-      root_layer()->test_properties()->AddChild(std::move(layer));
+      root_layer_for_testing()->test_properties()->AddChild(std::move(layer));
       return ptr;
     }
 
     template <typename T,
               typename A,
               typename B,
               typename C,
               typename D,
               typename E>
     T* AddChildToRoot(const A& a,
                       const B& b,
                       const C& c,
                       const D& d,
                       const E& e) {
       std::unique_ptr<T> layer = T::Create(host_->host_impl()->active_tree(),
                                            layer_impl_id_++, a, b, c, d, e);
       T* ptr = layer.get();
-      root_layer()->test_properties()->AddChild(std::move(layer));
+      root_layer_for_testing()->test_properties()->AddChild(std::move(layer));
       return ptr;
     }
 
     void CalcDrawProps(const gfx::Size& viewport_size);
     void AppendQuadsWithOcclusion(LayerImpl* layer_impl,
                                   const gfx::Rect& occluded);
     void AppendQuadsForPassWithOcclusion(LayerImpl* layer_impl,
                                          RenderPass* given_render_pass,
                                          const gfx::Rect& occluded);
     void AppendSurfaceQuadsWithOcclusion(RenderSurfaceImpl* surface_impl,
                                          const gfx::Rect& occluded);
 
     void RequestCopyOfOutput();
 
     OutputSurface* output_surface() const {
       return host_->host_impl()->output_surface();
     }
     ResourceProvider* resource_provider() const {
       return host_->host_impl()->resource_provider();
     }
-    LayerImpl* root_layer() const {
-      return host_impl()->active_tree()->root_layer();
+    LayerImpl* root_layer_for_testing() const {
+      return host_impl()->active_tree()->root_layer_for_testing();
     }
     FakeLayerTreeHost* host() { return host_.get(); }
     FakeLayerTreeHostImpl* host_impl() const { return host_->host_impl(); }
     TaskRunnerProvider* task_runner_provider() const {
       return host_->host_impl()->task_runner_provider();
     }
     const QuadList& quad_list() const { return render_pass_->quad_list; }
     scoped_refptr<AnimationTimeline> timeline() { return timeline_; }
     scoped_refptr<AnimationTimeline> timeline_impl() { return timeline_impl_; }
 
    private:
     FakeLayerTreeHostClient client_;
     TestTaskGraphRunner task_graph_runner_;
     std::unique_ptr<OutputSurface> output_surface_;
     std::unique_ptr<FakeLayerTreeHost> host_;
     std::unique_ptr<RenderPass> render_pass_;
     scoped_refptr<AnimationTimeline> timeline_;
     scoped_refptr<AnimationTimeline> timeline_impl_;
     int layer_impl_id_;
   };
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_LAYER_TEST_COMMON_H_