Use a cc::Display for layout tests.

content/renderer/layout_test_dependencies.h

Index: content/renderer/layout_test_dependencies.h
diff --git a/content/renderer/layout_test_dependencies.h b/content/renderer/layout_test_dependencies.h
index 2085285048fccd78e536c712eb55565bc0a24c08..743c61d2c7a43ce198342f5ad6e57d179f3e69a5 100644
--- a/content/renderer/layout_test_dependencies.h
+++ b/content/renderer/layout_test_dependencies.h
@@ -15,16 +15,22 @@ class ContextProvider;
 class OutputSurface;
 }
 
+namespace gpu {
+class GpuChannelHost;
+}
+
 namespace content {
+class CompositorDependencies;
 
 // This class allows injection of LayoutTest-specific behaviour to the
 // RenderThreadImpl.
 class LayoutTestDependencies {
  public:
   virtual std::unique_ptr<cc::OutputSurface> CreateOutputSurface(
-      uint32_t output_surface_id,
-      scoped_refptr<cc::ContextProvider> context_provider,
-      scoped_refptr<cc::ContextProvider> worker_context_provider) = 0;
+      scoped_refptr<gpu::GpuChannelHost> gpu_channel,
+      scoped_refptr<cc::ContextProvider> compositor_context_provider,
+      scoped_refptr<cc::ContextProvider> worker_context_provider,
+      CompositorDependencies* deps) = 0;
 };
 
 }  // namespace content