cc: Make LayerTreeHostImpl unittests use a delegating output surface.

cc/test/test_delegating_output_surface.h

 // Copyright 2016 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_TEST_TEST_DELEGATING_OUTPUT_SURFACE_H_
 #define CC_TEST_TEST_DELEGATING_OUTPUT_SURFACE_H_
 
 #include "base/memory/weak_ptr.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/renderer_settings.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surface_manager.h"
 
 namespace cc {
 
 class TestDelegatingOutputSurface : public OutputSurface,
-                                    public SurfaceFactoryClient {
+                                    public SurfaceFactoryClient,
+                                    public DisplayClient {
  public:
   TestDelegatingOutputSurface(
       scoped_refptr<ContextProvider> compositor_context_provider,
       scoped_refptr<ContextProvider> worker_context_provider,
-      std::unique_ptr<Display> display,
-      bool context_shared_with_compositor,
-      bool allow_force_reclaim_resources);
+      std::unique_ptr<OutputSurface> display_output_surface,
+      SharedBitmapManager* shared_bitmap_manager,
+      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+      const RendererSettings& renderer_settings,
+      base::SingleThreadTaskRunner* task_runner,
+      bool synchronous_composite);
   ~TestDelegatingOutputSurface() override;
 
+  Display* display() const { return display_.get(); }
+
   // OutputSurface implementation.
   bool BindToClient(OutputSurfaceClient* client) override;
   void DetachFromClient() override;
   void SwapBuffers(CompositorFrame frame) override;
   void ForceReclaimResources() override;
   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;
+
  private:
   void DrawCallback(SurfaceDrawStatus);
 
-  class PixelTestDisplayClient : public DisplayClient {
-    void DisplayOutputSurfaceLost() override {}
-    void DisplaySetMemoryPolicy(const ManagedMemoryPolicy& policy) override {}
-  };
-
   // TODO(danakj): These don't to be stored in unique_ptrs when OutputSurface
   // is owned/destroyed on the compositor thread.
   std::unique_ptr<SurfaceManager> surface_manager_;
   std::unique_ptr<SurfaceIdAllocator> surface_id_allocator_;
   SurfaceId delegated_surface_id_;
 
   // Uses surface_manager_.
   std::unique_ptr<SurfaceFactory> surface_factory_;
 
-  PixelTestDisplayClient display_client_;
   // Uses surface_manager_.
   std::unique_ptr<Display> display_;
 
+  bool bound_ = false;
+
   base::WeakPtrFactory<TestDelegatingOutputSurface> weak_ptrs_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_TEST_DELEGATING_OUTPUT_SURFACE_H_