Introducing SurfaceReferenceFactory

ui/compositor/layer.h

Index: ui/compositor/layer.h
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index 6bce25e37769afff29245d6bb8084161c5857c97..cfb301df92a0169a9fe66a512499f94814d1f5f3 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -22,7 +22,7 @@
 #include "cc/layers/surface_layer.h"
 #include "cc/layers/texture_layer_client.h"
 #include "cc/resources/texture_mailbox.h"
-#include "cc/surfaces/surface_id.h"
+#include "cc/surfaces/sequence_surface_reference_factory.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/compositor/compositor.h"
@@ -293,11 +293,8 @@ class COMPOSITOR_EXPORT Layer
   bool TextureFlipped() const;
 
   // Begins showing content from a surface with a particular id.
-  void SetShowSurface(const cc::SurfaceId& surface_id,
-                      const cc::SurfaceLayer::SatisfyCallback& satisfy_callback,
-                      const cc::SurfaceLayer::RequireCallback& require_callback,
-                      const gfx::Size& surface_size_in_pixels,
-                      float scale);
+  void SetShowSurface(const cc::SurfaceInfo& surface_info,
+                      scoped_refptr<cc::SurfaceReferenceFactory> surface_ref);
 
   bool has_external_content() {
     return texture_layer_.get() || surface_layer_.get();