Get rid of virtual Display::CreateScheduler.

content/browser/compositor/browser_compositor_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 "content/browser/compositor/browser_compositor_output_surface.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 70 matching lines @@
 
 void BrowserCompositorOutputSurface::Initialize() {
   capabilities_.adjust_deadline_for_parent = false;
 }
 
 bool BrowserCompositorOutputSurface::BindToClient(
     cc::OutputSurfaceClient* client) {
   if (!OutputSurface::BindToClient(client))
     return false;
 
-  // Pass begin frame source up to Display to use for DisplayScheduler.
-  client->SetBeginFrameSource(synthetic_begin_frame_source_.get());
-
   // Don't want vsync notifications until there is a client.
   if (!use_begin_frame_scheduling_)
     vsync_manager_->AddObserver(this);
   return true;
 }
 
 void BrowserCompositorOutputSurface::UpdateVSyncParametersInternal(
     base::TimeTicks timebase,
     base::TimeDelta interval) {
   if (interval.is_zero()) {
@@ skipping 16 matching lines @@
     base::TimeDelta interval) {
   DCHECK(HasClient());
   if (use_begin_frame_scheduling_) {
     UpdateVSyncParametersInternal(timebase, interval);
     return;
   }
 
   vsync_manager_->UpdateVSyncParameters(timebase, interval);
 }
 
+cc::BeginFrameSource* BrowserCompositorOutputSurface::GetBeginFrameSource() {
+  // The BeginFrameSource for the Display and DisplayScheduler to use.
+  return synthetic_begin_frame_source_.get();
+}
+
 void BrowserCompositorOutputSurface::SetReflector(ReflectorImpl* reflector) {
   // Software mirroring is done by doing a GL copy out of the framebuffer - if
   // we have overlays then that data will be missing.
   if (overlay_candidate_validator_) {
     overlay_candidate_validator_->SetSoftwareMirrorMode(reflector != nullptr);
   }
   reflector_ = reflector;
 
   OnReflectorChanged();
 }
 
 void BrowserCompositorOutputSurface::OnReflectorChanged() {
 }
 
 base::Closure
 BrowserCompositorOutputSurface::CreateCompositionStartedCallback() {
   return base::Closure();
 }
 
 cc::OverlayCandidateValidator*
 BrowserCompositorOutputSurface::GetOverlayCandidateValidator() const {
   return overlay_candidate_validator_.get();
 }
 
 }  // namespace content