Revert of Make cc::Display not own its BeginFrameSource

cc/surfaces/display.h

Index: cc/surfaces/display.h
diff --git a/cc/surfaces/display.h b/cc/surfaces/display.h
index 256777bbf5e75ab0ef4843e62eea2a87f145a767..bf786ae15c48bf839311097c02ce2bf894b17fd4 100644
--- a/cc/surfaces/display.h
+++ b/cc/surfaces/display.h
@@ -57,7 +57,7 @@
   Display(SharedBitmapManager* bitmap_manager,
           gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
           const RendererSettings& settings,
-          BeginFrameSource* begin_frame_source,
+          std::unique_ptr<BeginFrameSource> begin_frame_source,
           std::unique_ptr<OutputSurface> output_surface,
           std::unique_ptr<DisplayScheduler> scheduler,
           std::unique_ptr<TextureMailboxDeleter> texture_mailbox_deleter);
@@ -117,7 +117,6 @@
   SharedBitmapManager* const bitmap_manager_;
   gpu::GpuMemoryBufferManager* const gpu_memory_buffer_manager_;
   const RendererSettings settings_;
-  BeginFrameSource* const begin_frame_source_;
 
   DisplayClient* client_ = nullptr;
   SurfaceManager* surface_manager_ = nullptr;
@@ -132,6 +131,9 @@
   gfx::Rect external_viewport_;
   bool output_is_secure_ = false;
 
+  // The begin_frame_source_ is often known by the output_surface_ and
+  // the scheduler_.
+  std::unique_ptr<BeginFrameSource> begin_frame_source_;
   std::unique_ptr<OutputSurface> output_surface_;
   std::unique_ptr<DisplayScheduler> scheduler_;
   std::unique_ptr<ResourceProvider> resource_provider_;