Use a cc::Display for layout tests.

cc/test/pixel_test_delegating_output_surface.cc

Index: cc/test/pixel_test_delegating_output_surface.cc
diff --git a/cc/test/pixel_test_delegating_output_surface.cc b/cc/test/pixel_test_delegating_output_surface.cc
index a7ceef13160bfadc8a34a25c644a84e2b41793ff..08c810f2a5d2f5c67fa7c62d9ec7a7c85a3a82fb 100644
--- a/cc/test/pixel_test_delegating_output_surface.cc
+++ b/cc/test/pixel_test_delegating_output_surface.cc
@@ -28,6 +28,7 @@ namespace cc {
 PixelTestDelegatingOutputSurface::PixelTestDelegatingOutputSurface(
     scoped_refptr<ContextProvider> compositor_context_provider,
     scoped_refptr<ContextProvider> worker_context_provider,
+    scoped_refptr<ContextProvider> display_context_provider,
     SharedBitmapManager* shared_bitmap_manager,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     bool allow_force_reclaim_resources,
@@ -39,6 +40,7 @@ PixelTestDelegatingOutputSurface::PixelTestDelegatingOutputSurface(
       gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
       allow_force_reclaim_resources_(allow_force_reclaim_resources),
       synchronous_composite_(synchronous_composite),
+      display_context_provider_(std::move(display_context_provider)),
       surface_manager_(new SurfaceManager),
       surface_id_allocator_(
           new SurfaceIdAllocator(kCompositorSurfaceNamespace)),
@@ -73,11 +75,9 @@ bool PixelTestDelegatingOutputSurface::BindToClient(
     output_surface = base::MakeUnique<PixelTestOutputSurface>(
         std::move(software_output_device));
   } else {
-    scoped_refptr<TestInProcessContextProvider> context(
-        new TestInProcessContextProvider(nullptr));
     bool flipped_output_surface = false;
     output_surface = base::MakeUnique<PixelTestOutputSurface>(
-        std::move(context), nullptr, flipped_output_surface);
+        std::move(display_context_provider_), nullptr, flipped_output_surface);
   }
   output_surface->set_surface_expansion_size(surface_expansion_size);