cc: Clean up root_layer code in LTI

cc/trees/layer_tree_host_unittest_damage.cc

 // 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.
 
 #include "cc/trees/layer_tree_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/time/time.h"
@@ skipping 36 matching lines @@
         break;
     }
   }
 
   DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* impl,
                                    LayerTreeHostImpl::FrameData* frame_data,
                                    DrawResult draw_result) override {
     EXPECT_EQ(DRAW_SUCCESS, draw_result);
 
     RenderSurfaceImpl* root_surface =
-        impl->active_tree()->root_layer()->render_surface();
+        impl->active_tree()->root_layer_for_testing()->render_surface();
     gfx::Rect root_damage =
         root_surface->damage_tracker()->current_damage_rect();
 
     switch (draw_count_) {
       case 0:
         // The first frame has full damage.
         EXPECT_EQ(gfx::Rect(10, 10), root_damage);
         break;
       case 1:
         // The second frame has full damage.
@@ skipping 41 matching lines @@
         break;
     }
   }
 
   DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* impl,
                                    LayerTreeHostImpl::FrameData* frame_data,
                                    DrawResult draw_result) override {
     EXPECT_EQ(DRAW_SUCCESS, draw_result);
 
     RenderSurfaceImpl* root_surface =
-        impl->active_tree()->root_layer()->render_surface();
+        impl->active_tree()->root_layer_for_testing()->render_surface();
     gfx::Rect root_damage =
         root_surface->damage_tracker()->current_damage_rect();
 
     switch (draw_count_) {
       case 0:
         // The first frame has full damage.
         EXPECT_EQ(gfx::Rect(10, 10), root_damage);
         break;
       case 1:
         // The second frame has full damage.
@@ skipping 123 matching lines @@
     LayerTreeHostDamageTest::SetupTree();
     client_.set_bounds(root_->bounds());
   }
 
   DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
                                    LayerTreeHostImpl::FrameData* frame_data,
                                    DrawResult draw_result) override {
     EXPECT_EQ(DRAW_SUCCESS, draw_result);
 
     RenderSurfaceImpl* root_surface =
-        host_impl->active_tree()->root_layer()->render_surface();
+        host_impl->active_tree()->root_layer_for_testing()->render_surface();
     gfx::Rect root_damage =
         root_surface->damage_tracker()->current_damage_rect();
     root_damage.Intersect(root_surface->content_rect());
 
     int source_frame = host_impl->active_tree()->source_frame_number();
     switch (source_frame) {
       case 0:
         // The first frame draws and clears any damage.
         EXPECT_EQ(root_surface->content_rect(), root_damage);
         EXPECT_FALSE(frame_data->has_no_damage);
@@ skipping 104 matching lines @@
   void BeginTest() override {
     did_swaps_ = 0;
     PostSetNeedsCommitToMainThread();
   }
 
   DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
                                    LayerTreeHostImpl::FrameData* frame_data,
                                    DrawResult draw_result) override {
     EXPECT_EQ(DRAW_SUCCESS, draw_result);
     RenderSurfaceImpl* root_surface =
-        host_impl->active_tree()->root_layer()->render_surface();
+        host_impl->active_tree()->root_layer_for_testing()->render_surface();
     gfx::Rect root_damage =
         root_surface->damage_tracker()->current_damage_rect();
     root_damage.Intersect(root_surface->content_rect());
     switch (did_swaps_) {
       case 0:
         // The first frame has damage, so we should draw and swap.
         break;
       case 1:
         // The second frame should not damage the scrollbars.
         EXPECT_FALSE(root_damage.Intersects(gfx::Rect(300, 300, 10, 100)));
@@ skipping 64 matching lines @@
   void BeginTest() override {
     did_swaps_ = 0;
     PostSetNeedsCommitToMainThread();
   }
 
   DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
                                    LayerTreeHostImpl::FrameData* frame_data,
                                    DrawResult draw_result) override {
     EXPECT_EQ(DRAW_SUCCESS, draw_result);
     RenderSurfaceImpl* root_surface =
-        host_impl->active_tree()->root_layer()->render_surface();
+        host_impl->active_tree()->root_layer_for_testing()->render_surface();
     gfx::Rect root_damage =
         root_surface->damage_tracker()->current_damage_rect();
     root_damage.Intersect(root_surface->content_rect());
     int frame = host_impl->active_tree()->source_frame_number();
     switch (did_swaps_) {
       case 0:
         // The first frame has damage, so we should draw and swap.
         EXPECT_EQ(0, frame);
         break;
       case 1:
@@ skipping 41 matching lines @@
 
   void AfterTest() override { EXPECT_EQ(3, did_swaps_); }
 
   int did_swaps_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostDamageTestScrollbarCommitDoesNoDamage);
 
 }  // namespace
 }  // namespace cc