Introducing SurfaceReferenceFactory

ui/compositor/layer.h

Index: ui/compositor/layer.h
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index 4bb77d315bdc7e96014a88a6b7a7e7e874c27ae5..5bc37fdbfb9b48edaf5500d0a327703445d01633 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/surface_embedding.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,7 @@ 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,
-                      gfx::Size surface_size,
-                      float scale,
+  void SetShowSurface(const cc::SurfaceEmbeddingPtr surface_ref,
                       gfx::Size frame_size_in_dip);
 
   bool has_external_content() {