Hook up ui::Compositor to Display's BeginFrameSource

cc/surfaces/onscreen_display_client.cc

Index: cc/surfaces/onscreen_display_client.cc
diff --git a/cc/surfaces/onscreen_display_client.cc b/cc/surfaces/onscreen_display_client.cc
index 0f34a20421cc1f81f0078ce9ddd85b8287b5bd34..b408ed4bebc47caed1b7ac0b43431f943c010159 100644
--- a/cc/surfaces/onscreen_display_client.cc
+++ b/cc/surfaces/onscreen_display_client.cc
@@ -20,51 +20,24 @@ OnscreenDisplayClient::OnscreenDisplayClient(
     SharedBitmapManager* bitmap_manager,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     const RendererSettings& settings,
-    scoped_refptr<base::SingleThreadTaskRunner> task_runner)
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+    uint32_t compositor_surface_namespace)
     : output_surface_(std::move(output_surface)),
       task_runner_(task_runner),
       display_(new Display(this,
                            manager,
                            bitmap_manager,
                            gpu_memory_buffer_manager,
-                           settings)),
-      output_surface_lost_(false),
-      disable_display_vsync_(settings.disable_display_vsync) {}
+                           settings,
+                           compositor_surface_namespace)),
+      output_surface_lost_(false) {}
 
 OnscreenDisplayClient::~OnscreenDisplayClient() {
 }
 
 bool OnscreenDisplayClient::Initialize() {
   DCHECK(output_surface_);
-
-  BeginFrameSource* frame_source;
-  if (disable_display_vsync_) {
-    unthrottled_frame_source_.reset(
-        new BackToBackBeginFrameSource(task_runner_.get()));
-    frame_source = unthrottled_frame_source_.get();
-  } else {
-    synthetic_frame_source_.reset(new SyntheticBeginFrameSource(
-        task_runner_.get(), BeginFrameArgs::DefaultInterval()));
-    frame_source = synthetic_frame_source_.get();
-  }
-
-  scheduler_.reset(
-      new DisplayScheduler(display_.get(), frame_source, task_runner_.get(),
-                           output_surface_->capabilities().max_frames_pending));
-
-  return display_->Initialize(std::move(output_surface_), scheduler_.get());
-}
-
-void OnscreenDisplayClient::CommitVSyncParameters(base::TimeTicks timebase,
-                                                  base::TimeDelta interval) {
-  if (interval == base::TimeDelta()) {
-    // TODO(brianderson): We should not be receiving 0 intervals.
-    interval = BeginFrameArgs::DefaultInterval();
-  }
-
-  surface_display_output_surface_->ReceivedVSyncParameters(timebase, interval);
-  if (synthetic_frame_source_.get())
-    synthetic_frame_source_->OnUpdateVSyncParameters(timebase, interval);
+  return display_->Initialize(std::move(output_surface_), task_runner_.get());
 }
 
 void OnscreenDisplayClient::OutputSurfaceLost() {