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

cc/test/test_delegating_output_surface.h

Index: cc/test/test_delegating_output_surface.h
diff --git a/cc/test/test_delegating_output_surface.h b/cc/test/test_delegating_output_surface.h
index f5ac2944d91690340fdef84def374803b3c06e12..25ccb12356548aac1ad70e222fc42d892b10429c 100644
--- a/cc/test/test_delegating_output_surface.h
+++ b/cc/test/test_delegating_output_surface.h
@@ -17,24 +17,13 @@
 #include "cc/surfaces/surface_manager.h"
 
 namespace cc {
+
 class CopyOutputRequest;
-
-class TestDelegatingOutputSurfaceClient {
- public:
-  virtual ~TestDelegatingOutputSurfaceClient() {}
-
-  virtual void DisplayReceivedCompositorFrame(const CompositorFrame& frame) = 0;
-  virtual void DisplayWillDrawAndSwap(bool will_draw_and_swap,
-                                      const RenderPassList& render_passes) = 0;
-  virtual void DisplayDidDrawAndSwap() = 0;
-};
 
 class TestDelegatingOutputSurface : public OutputSurface,
                                     public SurfaceFactoryClient,
                                     public DisplayClient {
  public:
-  // Pass true for |force_disable_reclaim_resources| to act like the Display
-  // is out-of-process and can't return resources synchronously.
   TestDelegatingOutputSurface(
       scoped_refptr<ContextProvider> compositor_context_provider,
       scoped_refptr<ContextProvider> worker_context_provider,
@@ -43,13 +32,8 @@
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
       const RendererSettings& renderer_settings,
       base::SingleThreadTaskRunner* task_runner,
-      bool synchronous_composite,
-      bool force_disable_reclaim_resources);
+      bool synchronous_composite);
   ~TestDelegatingOutputSurface() override;
-
-  void SetClient(TestDelegatingOutputSurfaceClient* client) {
-    test_client_ = client;
-  }
 
   Display* display() const { return display_.get(); }
 
@@ -71,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(bool synchronous);
+  void DrawCallback(bool synchronous);
 
   // TODO(danakj): These don't to be stored in unique_ptrs when OutputSurface
   // is owned/destroyed on the compositor thread.
@@ -91,7 +72,6 @@
   std::unique_ptr<Display> display_;
 
   bool bound_ = false;
-  TestDelegatingOutputSurfaceClient* test_client_ = nullptr;
 
   std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests_;