Update from https://crrev.com/309717

cc/layers/layer_position_constraint_unittest.cc

Index: cc/layers/layer_position_constraint_unittest.cc
diff --git a/cc/layers/layer_position_constraint_unittest.cc b/cc/layers/layer_position_constraint_unittest.cc
index 5953f1083891277d2a21e776b31175953ae92f22..1c0619b8bcd3c8197c0076859a83f8c6f337e7ab 100644
--- a/cc/layers/layer_position_constraint_unittest.cc
+++ b/cc/layers/layer_position_constraint_unittest.cc
@@ -84,6 +84,7 @@ class LayerPositionConstraintTest : public testing::Test {
     scoped_ptr<LayerImpl> great_grand_child =
         LayerImpl::Create(host_impl_.active_tree(), 4);
 
+    root->SetHasRenderSurface(true);
     gfx::Transform IdentityMatrix;
     gfx::Point3F transform_origin;
     gfx::PointF position;
@@ -599,7 +600,7 @@ TEST_F(LayerPositionConstraintTest,
 
   child->SetIsContainerForFixedPositionLayers(true);
   grand_child->SetPosition(gfx::PointF(8.f, 6.f));
-  grand_child->SetForceRenderSurface(true);
+  grand_child->SetHasRenderSurface(true);
   great_grand_child->SetPositionConstraint(fixed_to_top_left_);
   great_grand_child->SetDrawsContent(true);
 
@@ -739,9 +740,9 @@ TEST_F(LayerPositionConstraintTest,
   // Actually set up the scenario here.
   child->SetIsContainerForFixedPositionLayers(true);
   grand_child->SetPosition(gfx::PointF(8.f, 6.f));
-  grand_child->SetForceRenderSurface(true);
+  grand_child->SetHasRenderSurface(true);
   great_grand_child->SetPosition(gfx::PointF(40.f, 60.f));
-  great_grand_child->SetForceRenderSurface(true);
+  great_grand_child->SetHasRenderSurface(true);
   fixed_position_child->SetPositionConstraint(fixed_to_top_left_);
   fixed_position_child->SetDrawsContent(true);
 
@@ -907,7 +908,7 @@ TEST_F(LayerPositionConstraintTest,
   LayerImpl* grand_child = child->children()[0];
 
   child->SetIsContainerForFixedPositionLayers(true);
-  child->SetForceRenderSurface(true);
+  child->SetHasRenderSurface(true);
   grand_child->SetPositionConstraint(fixed_to_top_left_);
   grand_child->SetDrawsContent(true);