Use a cc::Display for layout tests.

cc/test/layer_tree_pixel_test.cc

 // Copyright 2013 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.
 
 #include "cc/test/layer_tree_pixel_test.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/command_line.h"
@@ skipping 28 matching lines @@
 LayerTreePixelTest::~LayerTreePixelTest() {}
 
 void LayerTreePixelTest::InitializeSettings(LayerTreeSettings* settings) {
   // The PixelTestDelegatingOutputSurface will provide a BeginFrameSource.
   settings->use_output_surface_begin_frame_source = true;
 }
 
 std::unique_ptr<OutputSurface> LayerTreePixelTest::CreateOutputSurface() {
   scoped_refptr<TestInProcessContextProvider> compositor;
   scoped_refptr<TestInProcessContextProvider> worker;
+  scoped_refptr<TestInProcessContextProvider> display;
   if (test_type_ == PIXEL_TEST_GL) {
     compositor = new TestInProcessContextProvider(nullptr);
     worker = new TestInProcessContextProvider(compositor.get());
+    display = new TestInProcessContextProvider(nullptr);
   }
   const bool allow_force_reclaim_resources = !HasImplThread();
   const bool synchronous_composite =
       !layer_tree_host()->settings().single_thread_proxy_scheduler;
+  // Always test Webview shenanigans.
+  const gfx::Size surface_expansion_size(40, 60);
   std::unique_ptr<PixelTestDelegatingOutputSurface> delegating_output_surface(
       new PixelTestDelegatingOutputSurface(
-          std::move(compositor), std::move(worker), shared_bitmap_manager(),
-          gpu_memory_buffer_manager(), allow_force_reclaim_resources,
-          synchronous_composite));
+          std::move(compositor), std::move(worker), std::move(display),
+          RendererSettings(), shared_bitmap_manager(),
+          gpu_memory_buffer_manager(), surface_expansion_size,
+          allow_force_reclaim_resources, synchronous_composite));
   delegating_output_surface->SetEnlargePassTextureAmount(
       enlarge_texture_amount_);
   return std::move(delegating_output_surface);
 }
 
 std::unique_ptr<CopyOutputRequest>
 LayerTreePixelTest::CreateCopyOutputRequest() {
   return CopyOutputRequest::CreateBitmapRequest(
       base::Bind(&LayerTreePixelTest::ReadbackResult, base::Unretained(this)));
 }
@@ skipping 191 matching lines @@
 }
 
 void LayerTreePixelTest::Finish() {
   std::unique_ptr<gpu::GLInProcessContext> context =
       CreateTestInProcessContext();
   GLES2Interface* gl = context->GetImplementation();
   gl->Finish();
 }
 
 }  // namespace cc