Force use of and cache render surface.

cc/trees/layer_tree_host_unittest.cc

Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 46f45d591f636bd2b6e60df26e23b4485c0cfe70..81f67f8fe602a4857d1e99072374b63a8d4e24bf 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -807,7 +807,7 @@ class LayerTreeHostTestPushNodeOwnerToNodeIdMap : public LayerTreeHostTest {
     switch (layer_tree_host()->SourceFrameNumber()) {
       case 1:
         // child_ should create transform, effect node.
-        child_->SetForceRenderSurfaceForTesting(true);
+        child_->SetForceRenderSurface(true);
         break;
       case 2:
         // child_ should create a scroll node.
@@ -820,7 +820,7 @@ class LayerTreeHostTestPushNodeOwnerToNodeIdMap : public LayerTreeHostTest {
       case 4:
         // child_ should not create any property tree node.
         child_->SetMasksToBounds(false);
-        child_->SetForceRenderSurfaceForTesting(false);
+        child_->SetForceRenderSurface(false);
         child_->SetScrollClipLayerId(Layer::INVALID_ID);
     }
   }
@@ -914,12 +914,12 @@ class LayerTreeHostTestPushElementIdToNodeIdMap : public LayerTreeHostTest {
   void DidCommit() override {
     switch (layer_tree_host()->SourceFrameNumber()) {
       case 1:
-        child_->SetForceRenderSurfaceForTesting(true);
+        child_->SetForceRenderSurface(true);
         child_->AddMainThreadScrollingReasons(
             MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects);
         break;
       case 2:
-        child_->SetForceRenderSurfaceForTesting(false);
+        child_->SetForceRenderSurface(false);
         child_->ClearMainThreadScrollingReasons(
             MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects);
         break;
@@ -1016,7 +1016,7 @@ class LayerTreeHostTestSurfaceDamage : public LayerTreeHostTest {
 
     root_->SetBounds(gfx::Size(50, 50));
     root_->SetMasksToBounds(true);
-    child_->SetForceRenderSurfaceForTesting(true);
+    child_->SetForceRenderSurface(true);
 
     LayerTreeHostTest::SetupTree();
   }
@@ -1091,7 +1091,7 @@ class LayerTreeHostTestPropertyTreesChangedSync : public LayerTreeHostTest {
     root_ = Layer::Create();
     child_ = Layer::Create();
     // This is to force the child to create a transform and effect node.
-    child_->SetForceRenderSurfaceForTesting(true);
+    child_->SetForceRenderSurface(true);
     root_->AddChild(child_);
     layer_tree_host()->SetRootLayer(root_);
     LayerTreeHostTest::SetupTree();
@@ -2156,7 +2156,7 @@ class LayerTreeHostTestUndrawnLayersDamageLater : public LayerTreeHostTest {
       case 3:
         // Test owning the surface.
         parent_layer_->SetOpacity(0.5f);
-        parent_layer_->SetForceRenderSurfaceForTesting(true);
+        parent_layer_->SetForceRenderSurface(true);
         break;
       case 4:
         EndTest();
@@ -5676,8 +5676,8 @@ class LayerTreeHostTestRenderSurfaceEffectTreeIndex : public LayerTreeHostTest {
     root_->SetBounds(gfx::Size(50, 50));
     child_->SetBounds(gfx::Size(50, 50));
     grand_child_->SetBounds(gfx::Size(50, 50));
-    child_->SetForceRenderSurfaceForTesting(true);
-    grand_child_->SetForceRenderSurfaceForTesting(true);
+    child_->SetForceRenderSurface(true);
+    grand_child_->SetForceRenderSurface(true);
 
     LayerTreeHostTest::SetupTree();
   }
@@ -5717,7 +5717,7 @@ class LayerTreeHostTestRenderSurfaceEffectTreeIndex : public LayerTreeHostTest {
         // Setting an empty viewport causes draws to get skipped, so the active
         // tree won't update draw properties.
         layer_tree_host()->SetViewportSize(gfx::Size());
-        child_->SetForceRenderSurfaceForTesting(false);
+        child_->SetForceRenderSurface(false);
         break;
       case 3:
         layer_tree_host()->SetViewportSize(root_->bounds());