Remove SurfaceFactory And SurfaceFactoryClient

cc/surfaces/surface_aggregator.h

Index: cc/surfaces/surface_aggregator.h
diff --git a/cc/surfaces/surface_aggregator.h b/cc/surfaces/surface_aggregator.h
index 23c7b2f6e748b6628d64f6f724030ca82fbdaa93..8e36690f9c992ecc09d13d339f90c286738e8f33 100644
--- a/cc/surfaces/surface_aggregator.h
+++ b/cc/surfaces/surface_aggregator.h
@@ -21,7 +21,9 @@
 
 namespace cc {
 
+class BlockingTaskRunner;
 class CompositorFrame;
+class CompositorFrameSinkSupport;
 class ResourceProvider;
 class Surface;
 class SurfaceDrawQuad;
@@ -90,6 +92,11 @@ class CC_SURFACES_EXPORT SurfaceAggregator {
     int no_active_frame;
   };
 
+  static void UnrefHelper(
+      base::WeakPtr<CompositorFrameSinkSupport> compositor_frame_sink_support,
+      const ReturnedResourceArray& resources,
+      BlockingTaskRunner* main_thread_task_runner);
+
   ClipData CalculateClipRect(const ClipData& surface_clip,
                              const ClipData& quad_clip,
                              const gfx::Transform& target_transform);