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

content/renderer/android/synchronous_compositor_output_surface.h

 // Copyright 2013 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 CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_
 #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 125 matching lines @@
   scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_;
 
   base::CancelableClosure fallback_tick_;
   bool fallback_tick_pending_ = false;
   bool fallback_tick_running_ = false;
 
   class StubDisplayClient : public cc::DisplayClient {
     void DisplayOutputSurfaceLost() override {}
     void DisplaySetMemoryPolicy(
         const cc::ManagedMemoryPolicy& policy) override {}
-    void DisplayWillDrawAndSwap(
-        bool will_draw_and_swap,
-        const cc::RenderPassList& render_passes) override {}
-    void DisplayDidDrawAndSwap() override {}
   };
 
   // TODO(danakj): These don't to be stored in unique_ptrs when OutputSurface
   // is owned/destroyed on the compositor thread.
   std::unique_ptr<cc::SurfaceManager> surface_manager_;
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
   cc::SurfaceId delegated_surface_id_;
   // Uses surface_manager_.
   std::unique_ptr<cc::SurfaceFactory> surface_factory_;
   StubDisplayClient display_client_;
   // Uses surface_manager_.
   std::unique_ptr<cc::Display> display_;
   // Owned by |display_|.
   SoftwareOutputSurface* software_output_surface_ = nullptr;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorOutputSurface);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_