cc: Make OutputSurface entirely live on one thread in tests.

cc/test/layer_tree_pixel_test.cc

Index: cc/test/layer_tree_pixel_test.cc
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
index 4969f9e520e4b749eb45c06dd7919a187fad2c61..871573ea05371d3365f5759741265e0303f02753 100644
--- a/cc/test/layer_tree_pixel_test.cc
+++ b/cc/test/layer_tree_pixel_test.cc
@@ -56,7 +56,6 @@ std::unique_ptr<TestCompositorFrameSink>
   bool force_disable_reclaim_resources = false;
   auto delegating_output_surface = base::MakeUnique<TestCompositorFrameSink>(
       compositor_context_provider, std::move(worker_context_provider),
-      CreateDisplayOutputSurface(compositor_context_provider),
       shared_bitmap_manager(), gpu_memory_buffer_manager(), RendererSettings(),
       ImplThreadTaskRunner(), synchronous_composite,
       force_disable_reclaim_resources);
@@ -65,7 +64,8 @@ std::unique_ptr<TestCompositorFrameSink>
   return delegating_output_surface;
 }
 
-std::unique_ptr<OutputSurface> LayerTreePixelTest::CreateDisplayOutputSurface(
+std::unique_ptr<OutputSurface>
+LayerTreePixelTest::CreateDisplayOutputSurfaceOnThread(
     scoped_refptr<ContextProvider> compositor_context_provider) {
   std::unique_ptr<PixelTestOutputSurface> display_output_surface;
   if (test_type_ == PIXEL_TEST_GL) {