Update from https://crrev.com/316786

cc/test/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/pixel_test.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
@@ skipping 109 matching lines @@
 
   return MatchesPNGFile(
       *result_bitmap_, test_data_dir.Append(ref_file), comparator);
 }
 
 void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend,
                                 bool flipped_output_surface) {
   enable_pixel_output_.reset(new gfx::DisableNullDrawGLBindings);
 
   output_surface_.reset(new PixelTestOutputSurface(
-      new TestInProcessContextProvider, flipped_output_surface));
+      new TestInProcessContextProvider, new TestInProcessContextProvider,
+      flipped_output_surface));
   output_surface_->BindToClient(output_surface_client_.get());
 
   shared_bitmap_manager_.reset(new TestSharedBitmapManager);
   gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager);
   resource_provider_ =
       ResourceProvider::Create(output_surface_.get(),
                                shared_bitmap_manager_.get(),
                                gpu_memory_buffer_manager_.get(),
                                main_thread_task_runner_.get(),
                                0,
@@ skipping 43 matching lines @@
                                main_thread_task_runner_.get(),
                                0,
                                false,
                                1);
   renderer_ =
       SoftwareRenderer::Create(this, &settings_.renderer_settings,
                                output_surface_.get(), resource_provider_.get());
 }
 
 }  // namespace cc