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

cc/surfaces/surface_display_output_surface.h

 // 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.
 
 #ifndef CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_
 #define CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_
 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "cc/output/output_surface.h"
@@ skipping 37 matching lines @@
   void BindFramebuffer() override;
   uint32_t GetFramebufferCopyTextureFormat() override;
 
   // SurfaceFactoryClient implementation.
   void ReturnResources(const ReturnedResourceArray& resources) override;
   void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override;
 
   // 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_;
 
   SurfaceManager* surface_manager_;
   SurfaceIdAllocator* surface_id_allocator_;
   Display* display_;
   SurfaceFactory factory_;
   SurfaceId delegated_surface_id_;
   gfx::Size last_swap_frame_size_;
   bool output_surface_lost_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_