Moving RenderSurface creation outside of CalcDrawProps

cc/test/layer_tree_host_common_test.cc

Index: cc/test/layer_tree_host_common_test.cc
diff --git a/cc/test/layer_tree_host_common_test.cc b/cc/test/layer_tree_host_common_test.cc
index 844165720f6fdb7433a8ef0a28604e77a53996a5..d91652fe378ef165b1fd5f78f903e86f65dcb525 100644
--- a/cc/test/layer_tree_host_common_test.cc
+++ b/cc/test/layer_tree_host_common_test.cc
@@ -27,13 +27,9 @@ void LayerTreeHostCommonTestBase::SetLayerPropertiesForTesting(
     const gfx::Size& bounds,
     bool flatten_transform,
     bool is_3d_sorted) {
-  SetLayerPropertiesForTestingInternal<Layer>(layer,
-                                              transform,
-                                              transform_origin,
-                                              position,
-                                              bounds,
-                                              flatten_transform,
-                                              is_3d_sorted);
+  SetLayerPropertiesForTestingInternal(layer, transform, transform_origin,
+                                       position, bounds, flatten_transform,
+                                       is_3d_sorted);
 }
 
 void LayerTreeHostCommonTestBase::SetLayerPropertiesForTesting(
@@ -43,14 +39,15 @@ void LayerTreeHostCommonTestBase::SetLayerPropertiesForTesting(
     const gfx::PointF& position,
     const gfx::Size& bounds,
     bool flatten_transform,
-    bool is_3d_sorted) {
-  SetLayerPropertiesForTestingInternal<LayerImpl>(layer,
-                                                  transform,
-                                                  transform_origin,
-                                                  position,
-                                                  bounds,
-                                                  flatten_transform,
-                                                  is_3d_sorted);
+    bool is_3d_sorted,
+    bool create_render_surface) {
+  SetLayerPropertiesForTestingInternal(layer, transform, transform_origin,
+                                       position, bounds, flatten_transform,
+                                       is_3d_sorted);
+  if (create_render_surface) {
+    layer->SetHasRenderSurface(true);
+  }
+
   layer->SetContentBounds(bounds);
 }