Introducing SurfaceReferenceFactory

components/exo/surface.cc

Index: components/exo/surface.cc
diff --git a/components/exo/surface.cc b/components/exo/surface.cc
index 5edc802f9635be0168c30c9bf197969867378ace..e1ca2392133031a7ec8fa9fcd0fc2cd98033a9e1 100644
--- a/components/exo/surface.cc
+++ b/components/exo/surface.cc
@@ -20,6 +20,7 @@
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_id_allocator.h"
+#include "cc/surfaces/surface_info.h"
 #include "cc/surfaces/surface_manager.h"
 #include "components/exo/buffer.h"
 #include "components/exo/surface_delegate.h"
@@ -497,10 +498,12 @@ void Surface::CommitSurfaceHierarchy() {
     window_->layer()->SetBounds(
         gfx::Rect(window_->layer()->bounds().origin(), content_size_));
     window_->layer()->SetShowSurface(
-        cc::SurfaceId(factory_owner_->frame_sink_id_, local_frame_id_),
+        cc::SurfaceInfo(
+            cc::SurfaceId(factory_owner_->frame_sink_id_, local_frame_id_),
+            contents_surface_to_layer_scale, content_size_),
         base::Bind(&SatisfyCallback, base::Unretained(surface_manager_)),
         base::Bind(&RequireCallback, base::Unretained(surface_manager_)),
-        content_size_, contents_surface_to_layer_scale, content_size_);
+        content_size_);
     window_->layer()->SetFillsBoundsOpaquely(
         state_.blend_mode == SkXfermode::kSrc_Mode ||
         state_.opaque_region.contains(