Update from https://crrev.com/316786

cc/surfaces/surface_display_output_surface.cc

 // Copyright 2014 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/surfaces/surface_display_output_surface.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/onscreen_display_client.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
 
 namespace cc {
 
 SurfaceDisplayOutputSurface::SurfaceDisplayOutputSurface(
     SurfaceManager* surface_manager,
     SurfaceIdAllocator* allocator,
     const scoped_refptr<ContextProvider>& context_provider)
-    : OutputSurface(context_provider, nullptr),
+    : OutputSurface(context_provider),
       display_client_(NULL),
       surface_manager_(surface_manager),
       factory_(surface_manager, this),
       allocator_(allocator) {
   capabilities_.delegated_rendering = true;
   capabilities_.max_frames_pending = 1;
   capabilities_.can_force_reclaim_resources = true;
   // Frame always needs to be swapped because forced resource reclaiming
   // destroys the Display's copy.
   capabilities_.draw_and_swap_full_viewport_every_frame = true;
@@ skipping 61 matching lines @@
   if (client_)
     client_->ReclaimResources(&ack);
 }
 
 void SurfaceDisplayOutputSurface::SwapBuffersComplete(SurfaceDrawStatus drawn) {
   if (client_ && !display_client_->output_surface_lost())
     client_->DidSwapBuffersComplete();
 }
 
 }  // namespace cc