Make cc::Display not own its BeginFrameSource

cc/test/test_delegating_output_surface.cc

Index: cc/test/test_delegating_output_surface.cc
diff --git a/cc/test/test_delegating_output_surface.cc b/cc/test/test_delegating_output_surface.cc
index 6cad3102ff3687d721a5d4b6919ffcdabb1e89d3..ff3cf38c7f994e1331ed5b1bbde9db7559bdf55c 100644
--- a/cc/test/test_delegating_output_surface.cc
+++ b/cc/test/test_delegating_output_surface.cc
@@ -33,28 +33,27 @@ TestDelegatingOutputSurface::TestDelegatingOutputSurface(
       surface_id_allocator_(new SurfaceIdAllocator(kCompositorClientId)),
       surface_factory_(new SurfaceFactory(surface_manager_.get(), this)),
       weak_ptrs_(this) {
-  std::unique_ptr<SyntheticBeginFrameSource> begin_frame_source;
   std::unique_ptr<DisplayScheduler> scheduler;
   if (!synchronous_composite) {
     if (renderer_settings.disable_display_vsync) {
-      begin_frame_source.reset(new BackToBackBeginFrameSource(
+      begin_frame_source_.reset(new BackToBackBeginFrameSource(
           base::MakeUnique<DelayBasedTimeSource>(task_runner)));
     } else {
-      begin_frame_source.reset(new DelayBasedBeginFrameSource(
+      begin_frame_source_.reset(new DelayBasedBeginFrameSource(
           base::MakeUnique<DelayBasedTimeSource>(task_runner)));
-      begin_frame_source->SetAuthoritativeVSyncInterval(
+      begin_frame_source_->SetAuthoritativeVSyncInterval(
           base::TimeDelta::FromMilliseconds(1000.f /
                                             renderer_settings.refresh_rate));
     }
     scheduler.reset(new DisplayScheduler(
-        begin_frame_source.get(), task_runner,
+        begin_frame_source_.get(), task_runner,
         display_output_surface->capabilities().max_frames_pending));
   }
   const bool context_shared_with_compositor =
       display_output_surface->context_provider() == context_provider();
   display_.reset(
       new Display(shared_bitmap_manager, gpu_memory_buffer_manager,
-                  renderer_settings, std::move(begin_frame_source),
+                  renderer_settings, begin_frame_source_.get(),
                   std::move(display_output_surface), std::move(scheduler),
                   base::MakeUnique<TextureMailboxDeleter>(task_runner)));