Revert of DirectCompositorFrameSink Uses CompositorFrameSinkSupport

cc/surfaces/direct_compositor_frame_sink.h

Index: cc/surfaces/direct_compositor_frame_sink.h
diff --git a/cc/surfaces/direct_compositor_frame_sink.h b/cc/surfaces/direct_compositor_frame_sink.h
index db0a009d792702b0da320fa6621fab4736e60edc..609f3813ec510a3277637c87ce4b91c63cf460b9 100644
--- a/cc/surfaces/direct_compositor_frame_sink.h
+++ b/cc/surfaces/direct_compositor_frame_sink.h
@@ -8,8 +8,6 @@
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "cc/output/compositor_frame_sink.h"
-#include "cc/surfaces/compositor_frame_sink_support.h"
-#include "cc/surfaces/compositor_frame_sink_support_client.h"
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
@@ -25,9 +23,8 @@
 // client's frame being the root surface of the Display.
 class CC_SURFACES_EXPORT DirectCompositorFrameSink
     : public CompositorFrameSink,
-      public NON_EXPORTED_BASE(DisplayClient),
-      public CompositorFrameSinkSupportClient,
-      public ExternalBeginFrameSourceClient {
+      public SurfaceFactoryClient,
+      public NON_EXPORTED_BASE(DisplayClient) {
  public:
   // The underlying Display, SurfaceManager, and SurfaceIdAllocator must outlive
   // this class.
@@ -52,36 +49,30 @@
   void SubmitCompositorFrame(CompositorFrame frame) override;
   void ForceReclaimResources() override;
 
+  // SurfaceFactoryClient implementation.
+  void ReturnResources(const ReturnedResourceArray& resources) override;
+  void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override;
+
   // DisplayClient implementation.
   void DisplayOutputSurfaceLost() override;
   void DisplayWillDrawAndSwap(bool will_draw_and_swap,
                               const RenderPassList& render_passes) override;
   void DisplayDidDrawAndSwap() override;
 
-  // CompositorFrameSinkSupportClient implementation:
-  void DidReceiveCompositorFrameAck() override;
-  void OnBeginFrame(const BeginFrameArgs& args) override;
-  void ReclaimResources(const ReturnedResourceArray& resources) override;
-  void WillDrawSurface() override;
-
  private:
   void DidDrawCallback();
-
-  // ExternalBeginFrameSouceClient implementation:
-  void OnNeedsBeginFrames(bool needs_begin_frames) override;
 
   // This class is only meant to be used on a single thread.
   base::ThreadChecker thread_checker_;
 
   const FrameSinkId frame_sink_id_;
   LocalSurfaceId delegated_local_surface_id_;
+  SurfaceManager* surface_manager_;
   SurfaceIdAllocator surface_id_allocator_;
-  SurfaceManager* surface_manager_;
   Display* display_;
+  SurfaceFactory factory_;
   gfx::Size last_swap_frame_size_;
   bool is_lost_ = false;
-  std::unique_ptr<CompositorFrameSinkSupport> support_;
-  std::unique_ptr<ExternalBeginFrameSource> begin_frame_source_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectCompositorFrameSink);
 };