Consolidate OutputSurface constructors into GL vs Vulkan.

components/mus/surfaces/direct_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 "components/mus/surfaces/direct_output_surface.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface_client.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 
 namespace mus {
 
 DirectOutputSurface::DirectOutputSurface(
     scoped_refptr<SurfacesContextProvider> context_provider,
     base::SingleThreadTaskRunner* task_runner)
-    : cc::OutputSurface(context_provider),
+    : cc::OutputSurface(context_provider, nullptr, nullptr),

[rjkroege, 2016/05/23 21:30:07]

Perhaps DirectOutputSurfaceOzone's invocation of cc::OutputSurface needs to be
updated too?

[danakj, 2016/05/23 21:30:46]

Ya probably, I didn't try to build ozone locally.

       synthetic_begin_frame_source_(new cc::SyntheticBeginFrameSource(
           task_runner,
           cc::BeginFrameArgs::DefaultInterval())),
       weak_ptr_factory_(this) {
   context_provider->SetDelegate(this);
 }
 
 DirectOutputSurface::~DirectOutputSurface() {}
 
 bool DirectOutputSurface::BindToClient(cc::OutputSurfaceClient* client) {
@@ skipping 41 matching lines @@
   gpu::SyncToken sync_token;
   gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, sync_token.GetData());
 
   context_provider_->ContextSupport()->SignalSyncToken(
       sync_token, base::Bind(&OutputSurface::OnSwapBuffersComplete,
                              weak_ptr_factory_.GetWeakPtr()));
   client_->DidSwapBuffers();
 }
 
 }  // namespace mus