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

cc/surfaces/surface_display_output_surface.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/surfaces/surface_display_output_surface.h"
 
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/surface.h"
@@ skipping 57 matching lines @@
     }
     delegated_surface_id_ = surface_id_allocator_->GenerateId();
     factory_.Create(delegated_surface_id_);
     last_swap_frame_size_ = frame_size;
   }
   display_->SetSurfaceId(delegated_surface_id_,
                          frame.metadata.device_scale_factor);
 
   factory_.SubmitCompositorFrame(
       delegated_surface_id_, std::move(frame),
-      base::Bind(&SurfaceDisplayOutputSurface::DidDrawCallback,
+      base::Bind(&SurfaceDisplayOutputSurface::SwapBuffersComplete,
                  base::Unretained(this)));
 }
 
 bool SurfaceDisplayOutputSurface::BindToClient(OutputSurfaceClient* client) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   surface_manager_->RegisterSurfaceFactoryClient(
       surface_id_allocator_->client_id(), this);
 
   if (!OutputSurface::BindToClient(client))
@@ skipping 57 matching lines @@
 void SurfaceDisplayOutputSurface::DisplayOutputSurfaceLost() {
   output_surface_lost_ = true;
   DidLoseOutputSurface();
 }
 
 void SurfaceDisplayOutputSurface::DisplaySetMemoryPolicy(
     const ManagedMemoryPolicy& policy) {
   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();
 }
 
 }  // namespace cc