Split SurfaceFactoryClient Into Four Interfaces

cc/surfaces/compositor_frame_sink_support.cc

Index: cc/surfaces/compositor_frame_sink_support.cc
diff --git a/cc/surfaces/compositor_frame_sink_support.cc b/cc/surfaces/compositor_frame_sink_support.cc
index 84b0a41d9ccab9613dffa7138ecbb78d6f13b5ef..840b51496a19769f07edabf2e1b42722163696d4 100644
--- a/cc/surfaces/compositor_frame_sink_support.cc
+++ b/cc/surfaces/compositor_frame_sink_support.cc
@@ -47,7 +47,7 @@ CompositorFrameSinkSupport::~CompositorFrameSinkSupport() {
   // call back into here and access |client_| so we should destroy
   // |surface_factory_|'s resources early on.
   surface_factory_->EvictSurface();
-  surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
+  surface_manager_->UnregisterFrameSinkManagerClient(frame_sink_id_);
   if (handles_frame_sink_id_invalidation_)
     surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
 }
@@ -236,11 +236,11 @@ CompositorFrameSinkSupport::CompositorFrameSinkSupport(
 void CompositorFrameSinkSupport::Init(SurfaceManager* surface_manager,
                                       bool needs_sync_points) {
   surface_manager_ = surface_manager;
-  surface_factory_ =
-      base::MakeUnique<SurfaceFactory>(frame_sink_id_, surface_manager_, this);
+  surface_factory_ = base::MakeUnique<SurfaceFactory>(
+      frame_sink_id_, surface_manager_, this, this, this);
   if (handles_frame_sink_id_invalidation_)
     surface_manager_->RegisterFrameSinkId(frame_sink_id_);
-  surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
+  surface_manager_->RegisterFrameSinkManagerClient(frame_sink_id_, this);
   surface_factory_->set_needs_sync_points(needs_sync_points);
 }