Remove SurfaceFactory Occurrences Outside Of cc

cc/surfaces/compositor_frame_sink_support.h

Index: cc/surfaces/compositor_frame_sink_support.h
diff --git a/cc/surfaces/compositor_frame_sink_support.h b/cc/surfaces/compositor_frame_sink_support.h
index bdafb4933e6c0f752edc1fde38a9d63fd003d6b5..d3d3cbbe5b470862e052206cebf4de6303a0feb0 100644
--- a/cc/surfaces/compositor_frame_sink_support.h
+++ b/cc/surfaces/compositor_frame_sink_support.h
@@ -47,6 +47,16 @@ class CC_SURFACES_EXPORT CompositorFrameSinkSupport
     return reference_tracker_;
   }
 
+  // SurfaceFactoryClient implementation.
+  void ReferencedSurfacesChanged(
+      const LocalSurfaceId& local_surface_id,
+      const std::vector<SurfaceId>* active_referenced_surfaces,
+      const std::vector<SurfaceId>* pending_referenced_surfaces) override;
+  void ReturnResources(const ReturnedResourceArray& resources) override;
+  void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override;
+  void WillDrawSurface(const LocalSurfaceId& local_surface_id,
+                       const gfx::Rect& damage_rect) override;
+
   void EvictFrame();
   void SetNeedsBeginFrame(bool needs_begin_frame);
   void BeginFrameDidNotSwap(const BeginFrameAck& ack);
@@ -69,16 +79,6 @@ class CC_SURFACES_EXPORT CompositorFrameSinkSupport
 
   void DidReceiveCompositorFrameAck();
 
-  // SurfaceFactoryClient implementation.
-  void ReferencedSurfacesChanged(
-      const LocalSurfaceId& local_surface_id,
-      const std::vector<SurfaceId>* active_referenced_surfaces,
-      const std::vector<SurfaceId>* pending_referenced_surfaces) override;
-  void ReturnResources(const ReturnedResourceArray& resources) override;
-  void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override;
-  void WillDrawSurface(const LocalSurfaceId& local_surface_id,
-                       const gfx::Rect& damage_rect) override;
-
   // BeginFrameObserver implementation.
   void OnBeginFrame(const BeginFrameArgs& args) override;
   const BeginFrameArgs& LastUsedBeginFrameArgs() const override;