Revert of cc: Make LayerTreeTests use a DelegatingRenderer and Display.

cc/surfaces/surface_display_output_surface.h

Index: cc/surfaces/surface_display_output_surface.h
diff --git a/cc/surfaces/surface_display_output_surface.h b/cc/surfaces/surface_display_output_surface.h
index d5f2d9fb5e9153360dfe907d1bfc03a23b6d017e..f1bd5ea3460e4be4bc94d4fe96a1d3b7acec5886 100644
--- a/cc/surfaces/surface_display_output_surface.h
+++ b/cc/surfaces/surface_display_output_surface.h
@@ -55,12 +55,9 @@
   // DisplayClient implementation.
   void DisplayOutputSurfaceLost() override;
   void DisplaySetMemoryPolicy(const ManagedMemoryPolicy& policy) override;
-  void DisplayWillDrawAndSwap(bool will_draw_and_swap,
-                              const RenderPassList& render_passes) override;
-  void DisplayDidDrawAndSwap() override;
 
  private:
-  void DidDrawCallback();
+  void SwapBuffersComplete();
 
   // This class is only meant to be used on a single thread.
   base::ThreadChecker thread_checker_;