Use a cc::Display for layout tests.

content/renderer/layout_test_dependencies.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 CONTENT_RENDER_LAYOUT_TEST_DEPENDENCIES_H_
 #define CONTENT_RENDER_LAYOUT_TEST_DEPENDENCIES_H_
 
 #include <stdint.h>
 #include <memory>
 
 #include "base/memory/ref_counted.h"
 
 namespace cc {
 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
 
 #endif  // CONTENT_RENDER_LAYOUT_TEST_DEPENDENCIES_H_