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 ddc4d1b4b8d9e4594c7ddf18e62c76436e6e6210..609f3813ec510a3277637c87ce4b91c63cf460b9 100644
--- a/cc/surfaces/direct_compositor_frame_sink.h
+++ b/cc/surfaces/direct_compositor_frame_sink.h
@@ -8,9 +8,6 @@
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "cc/output/compositor_frame_sink.h"
-#include "cc/scheduler/begin_frame_source.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"
@@ -26,8 +23,7 @@
 // client's frame being the root surface of the Display.
 class CC_SURFACES_EXPORT DirectCompositorFrameSink
     : public CompositorFrameSink,
-      public NON_EXPORTED_BASE(CompositorFrameSinkSupportClient),
-      public ExternalBeginFrameSourceClient,
+      public SurfaceFactoryClient,
       public NON_EXPORTED_BASE(DisplayClient) {
  public:
   // The underlying Display, SurfaceManager, and SurfaceIdAllocator must outlive
@@ -53,6 +49,10 @@
   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,
@@ -60,15 +60,7 @@
   void DisplayDidDrawAndSwap() override;
 
  private:
-  // CompositorFrameSinkSupportClient implementation:
-  void DidReceiveCompositorFrameAck() override;
-  void OnBeginFrame(const BeginFrameArgs& args) override;
-  void ReclaimResources(const ReturnedResourceArray& resources) override;
-  void WillDrawSurface(const LocalSurfaceId& local_surface_id,
-                       const gfx::Rect& damage_rect) override;
-
-  // ExternalBeginFrameSourceClient implementation:
-  void OnNeedsBeginFrames(bool needs_begin_frame) override;
+  void DidDrawCallback();
 
   // This class is only meant to be used on a single thread.
   base::ThreadChecker thread_checker_;
@@ -78,10 +70,9 @@
   SurfaceManager* surface_manager_;
   SurfaceIdAllocator surface_id_allocator_;
   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);
 };