Update from https://crrev.com/316786

cc/test/pixel_test_output_surface.cc

Index: cc/test/pixel_test_output_surface.cc
diff --git a/cc/test/pixel_test_output_surface.cc b/cc/test/pixel_test_output_surface.cc
index ced1898e4db34468c9d49a522aa14c0a2c8d23c1..616103c88387ed8c032644973a43b98f304c119b 100644
--- a/cc/test/pixel_test_output_surface.cc
+++ b/cc/test/pixel_test_output_surface.cc
@@ -11,14 +11,25 @@ namespace cc {
 
 PixelTestOutputSurface::PixelTestOutputSurface(
     scoped_refptr<ContextProvider> context_provider,
+    scoped_refptr<ContextProvider> worker_context_provider,
     bool flipped_output_surface)
-    : OutputSurface(context_provider), external_stencil_test_(false) {
+    : OutputSurface(context_provider, worker_context_provider),
+      external_stencil_test_(false) {
   capabilities_.flipped_output_surface = flipped_output_surface;
 }
 
 PixelTestOutputSurface::PixelTestOutputSurface(
+    scoped_refptr<ContextProvider> context_provider,
+    bool flipped_output_surface)
+    : PixelTestOutputSurface(context_provider,
+                             nullptr,
+                             flipped_output_surface) {
+}
+
+PixelTestOutputSurface::PixelTestOutputSurface(
     scoped_ptr<SoftwareOutputDevice> software_device)
-    : OutputSurface(software_device.Pass()), external_stencil_test_(false) {}
+    : OutputSurface(software_device.Pass()), external_stencil_test_(false) {
+}
 
 void PixelTestOutputSurface::Reshape(const gfx::Size& size,
                                      float scale_factor) {