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

cc/surfaces/surface_display_output_surface.cc

Index: cc/surfaces/surface_display_output_surface.cc
diff --git a/cc/surfaces/surface_display_output_surface.cc b/cc/surfaces/surface_display_output_surface.cc
index 294840be307e20f0315fc07ccd150fc10013e419..3b1d59d8aff2ab4bade8e55dac27f516d269ecaf 100644
--- a/cc/surfaces/surface_display_output_surface.cc
+++ b/cc/surfaces/surface_display_output_surface.cc
@@ -75,7 +75,7 @@
 
   factory_.SubmitCompositorFrame(
       delegated_surface_id_, std::move(frame),
-      base::Bind(&SurfaceDisplayOutputSurface::DidDrawCallback,
+      base::Bind(&SurfaceDisplayOutputSurface::SwapBuffersComplete,
                  base::Unretained(this)));
 }
 
@@ -153,19 +153,7 @@
   SetMemoryPolicy(policy);
 }
 
-void SurfaceDisplayOutputSurface::DisplayWillDrawAndSwap(
-    bool will_draw_and_swap,
-    const RenderPassList& render_passes) {
-  // This notification is not relevant to our client outside of tests.
-}
-
-void SurfaceDisplayOutputSurface::DisplayDidDrawAndSwap() {
-  // This notification is not relevant to our client outside of tests. We
-  // unblock the client from DidDrawCallback() when the surface is going to
-  // be drawn.
-}
-
-void SurfaceDisplayOutputSurface::DidDrawCallback() {
+void SurfaceDisplayOutputSurface::SwapBuffersComplete() {
   // TODO(danakj): Why the lost check?
   if (!output_surface_lost_)
     client_->DidSwapBuffersComplete();