Moves ownership of the cc::Display's BeginFrameSource out of Display.

cc/surfaces/direct_compositor_frame_sink_unittest.cc

Index: cc/surfaces/direct_compositor_frame_sink_unittest.cc
diff --git a/cc/surfaces/direct_compositor_frame_sink_unittest.cc b/cc/surfaces/direct_compositor_frame_sink_unittest.cc
index 8b39040256dc9c4bb0416ab70112bf7a28f231d8..1a6e1582f16d4fdf03601351c59c775bf9438b76 100644
--- a/cc/surfaces/direct_compositor_frame_sink_unittest.cc
+++ b/cc/surfaces/direct_compositor_frame_sink_unittest.cc
@@ -42,17 +42,16 @@ class DirectCompositorFrameSinkTest : public testing::Test {
         FakeOutputSurface::Create3d();
     display_output_surface_ = display_output_surface.get();
 
-    std::unique_ptr<BeginFrameSource> begin_frame_source(
-        new BackToBackBeginFrameSource(
-            base::MakeUnique<DelayBasedTimeSource>(task_runner_.get())));
+    begin_frame_source_.reset(new BackToBackBeginFrameSource(
+        base::MakeUnique<DelayBasedTimeSource>(task_runner_.get())));
 
     int max_frames_pending = 2;
-    std::unique_ptr<DisplayScheduler> scheduler(new DisplayScheduler(
-        begin_frame_source.get(), task_runner_.get(), max_frames_pending));
+    std::unique_ptr<DisplayScheduler> scheduler(
+        new DisplayScheduler(task_runner_.get(), max_frames_pending));
 
     display_.reset(new Display(
         &bitmap_manager_, &gpu_memory_buffer_manager_, RendererSettings(),
-        kArbitraryFrameSinkId, std::move(begin_frame_source),
+        kArbitraryFrameSinkId, begin_frame_source_.get(),
         std::move(display_output_surface), std::move(scheduler),
         base::MakeUnique<TextureMailboxDeleter>(task_runner_.get())));
     compositor_frame_sink_.reset(new DirectCompositorFrameSink(
@@ -103,6 +102,7 @@ class DirectCompositorFrameSinkTest : public testing::Test {
 
   scoped_refptr<TestContextProvider> context_provider_;
   FakeOutputSurface* display_output_surface_ = nullptr;
+  std::unique_ptr<BeginFrameSource> begin_frame_source_;
   std::unique_ptr<Display> display_;
   FakeCompositorFrameSinkClient compositor_frame_sink_client_;
   std::unique_ptr<DirectCompositorFrameSink> compositor_frame_sink_;