Moving RenderSurface creation outside of CalcDrawProps

cc/test/layer_tree_host_common_test.h

Index: cc/test/layer_tree_host_common_test.h
diff --git a/cc/test/layer_tree_host_common_test.h b/cc/test/layer_tree_host_common_test.h
index 67eb6cc58b3da0af29b229a57c1154352fc5c0ef..e403fd6a73a6d8d24ae9bedb8c0314a0c3ef314b 100644
--- a/cc/test/layer_tree_host_common_test.h
+++ b/cc/test/layer_tree_host_common_test.h
@@ -29,22 +29,24 @@ class LayerTreeHostCommonTestBase {
   LayerTreeHostCommonTestBase();
   virtual ~LayerTreeHostCommonTestBase();
 
-  template <typename LayerType>
   void SetLayerPropertiesForTestingInternal(
-      LayerType* layer,
+      Layer* layer,
       const gfx::Transform& transform,
       const gfx::Point3F& transform_origin,
       const gfx::PointF& position,
       const gfx::Size& bounds,
       bool flatten_transform,
-      bool is_3d_sorted) {
-    layer->SetTransform(transform);
-    layer->SetTransformOrigin(transform_origin);
-    layer->SetPosition(position);
-    layer->SetBounds(bounds);
-    layer->SetShouldFlattenTransform(flatten_transform);
-    layer->Set3dSortingContextId(is_3d_sorted ? 1 : 0);
-  }
+      bool is_3d_sorted,
+      bool create_render_surface);
+  void SetLayerPropertiesForTestingInternal(
+      LayerImpl* layer,
+      const gfx::Transform& transform,
+      const gfx::Point3F& transform_origin,
+      const gfx::PointF& position,
+      const gfx::Size& bounds,
+      bool flatten_transform,
+      bool is_3d_sorted,
+      bool create_render_surface);
 
   void SetLayerPropertiesForTesting(Layer* layer,
                                     const gfx::Transform& transform,
@@ -60,7 +62,8 @@ class LayerTreeHostCommonTestBase {
                                     const gfx::PointF& position,
                                     const gfx::Size& bounds,
                                     bool flatten_transform,
-                                    bool is_3d_sorted);
+                                    bool is_3d_sorted,
+                                    bool create_render_surface);
 
   void ExecuteCalculateDrawProperties(Layer* root_layer,
                                       float device_scale_factor,