Use a cc::Display for layout tests.

cc/test/pixel_test_delegating_output_surface.h

Index: cc/test/pixel_test_delegating_output_surface.h
diff --git a/cc/test/pixel_test_delegating_output_surface.h b/cc/test/pixel_test_delegating_output_surface.h
index 2b4166b95c08814f05e0b10cf413736b9fb12a2c..2df41e0bdfb8b4f219a30aaad7437ab907e5a52c 100644
--- a/cc/test/pixel_test_delegating_output_surface.h
+++ b/cc/test/pixel_test_delegating_output_surface.h
@@ -7,6 +7,7 @@
 
 #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"
@@ -23,8 +24,11 @@ class PixelTestDelegatingOutputSurface : public OutputSurface,
   PixelTestDelegatingOutputSurface(
       scoped_refptr<ContextProvider> compositor_context_provider,
       scoped_refptr<ContextProvider> worker_context_provider,
+      scoped_refptr<ContextProvider> display_context_provider,
+      const RendererSettings& renderer_settings,
       SharedBitmapManager* shared_bitmap_manager,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+      const gfx::Size& surface_expansion_size,
       bool allow_force_reclaim_resources,
       bool synchronous_composite);
   ~PixelTestDelegatingOutputSurface() override;
@@ -56,8 +60,13 @@ class PixelTestDelegatingOutputSurface : public OutputSurface,
 
   SharedBitmapManager* const shared_bitmap_manager_;
   gpu::GpuMemoryBufferManager* const gpu_memory_buffer_manager_;
+  const gfx::Size surface_expansion_size_;
   const bool allow_force_reclaim_resources_;
   const bool synchronous_composite_;
+  const RendererSettings renderer_settings_;
+
+  // Passed to the Display.
+  scoped_refptr<ContextProvider> display_context_provider_;

[enne (OOO), 2016/06/23 23:17:55]

I hate temporary members like this, but I don't see how to do it differently.

[danakj, 2016/06/23 23:21:04]

I think we can maybe do this once OutputSurface and CompositorFrameSink are
different, then maybe OutputSurface can take this at BindToClient time.

 
   gfx::Size enlarge_pass_texture_amount_;