Introducing SurfaceReferenceFactory

cc/layers/surface_layer_impl_unittest.cc

Index: cc/layers/surface_layer_impl_unittest.cc
diff --git a/cc/layers/surface_layer_impl_unittest.cc b/cc/layers/surface_layer_impl_unittest.cc
index 4d37da42fa998ef5773613426aed6ff6770bb3a2..6f7eab16fba06394551763d631915d8e766a714c 100644
--- a/cc/layers/surface_layer_impl_unittest.cc
+++ b/cc/layers/surface_layer_impl_unittest.cc
@@ -28,9 +28,7 @@ TEST(SurfaceLayerImplTest, Occlusion) {
   surface_layer_impl->SetBounds(layer_size);
   surface_layer_impl->SetDrawsContent(true);
   SurfaceId surface_id(kArbitraryFrameSinkId, kArbitraryLocalFrameId);
-  surface_layer_impl->SetSurfaceId(surface_id);
-  surface_layer_impl->SetSurfaceScale(1.f);
-  surface_layer_impl->SetSurfaceSize(layer_size);
+  surface_layer_impl->SetSurfaceInfo(SurfaceInfo(surface_id, 1.f, layer_size));
 
   impl.CalcDrawProps(viewport_size);
 
@@ -87,9 +85,8 @@ TEST(SurfaceLayerImplTest, SurfaceStretchedToLayerBounds) {
   surface_layer_impl->SetBounds(layer_size);
   surface_layer_impl->SetDrawsContent(true);
   SurfaceId surface_id(kArbitraryFrameSinkId, kArbitraryLocalFrameId);
-  surface_layer_impl->SetSurfaceId(surface_id);
-  surface_layer_impl->SetSurfaceScale(surface_scale);
-  surface_layer_impl->SetSurfaceSize(surface_size);
+  surface_layer_impl->SetSurfaceInfo(
+      SurfaceInfo(surface_id, surface_scale, surface_size));
   surface_layer_impl->SetStretchContentToFillBounds(true);
 
   std::unique_ptr<RenderPass> render_pass = RenderPass::Create();