Revert of Make cc::Display not own its BeginFrameSource

blimp/client/app/compositor/browser_compositor.cc

 // Copyright 2016 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 "blimp/client/app/compositor/browser_compositor.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "blimp/client/public/compositor/compositor_dependencies.h"
@@ skipping 161 matching lines @@
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager =
       compositor_dependencies_->GetGpuMemoryBufferManager();
 
   scoped_refptr<cc::ContextProvider> context_provider =
       BlimpContextProvider::Create(widget_, gpu_memory_buffer_manager);
 
   std::unique_ptr<cc::OutputSurface> display_output_surface =
       base::MakeUnique<DisplayOutputSurface>(context_provider);
 
   auto* task_runner = base::ThreadTaskRunnerHandle::Get().get();
-  begin_frame_source_.reset(new cc::DelayBasedBeginFrameSource(
-      base::MakeUnique<cc::DelayBasedTimeSource>(task_runner)));
+  std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source(
+      new cc::DelayBasedBeginFrameSource(
+          base::MakeUnique<cc::DelayBasedTimeSource>(task_runner)));
   std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
-      begin_frame_source_.get(), task_runner,
+      begin_frame_source.get(), task_runner,
       display_output_surface->capabilities().max_frames_pending));
 
   display_ = base::MakeUnique<cc::Display>(
       nullptr /*shared_bitmap_manager*/, gpu_memory_buffer_manager,
-      host_->settings().renderer_settings, begin_frame_source_.get(),
+      host_->settings().renderer_settings, std::move(begin_frame_source),
       std::move(display_output_surface), std::move(scheduler),
       base::MakeUnique<cc::TextureMailboxDeleter>(task_runner));
   display_->SetVisible(true);
   display_->Resize(viewport_size_in_px_);
 
   // The Browser compositor and display share the same context provider.
   std::unique_ptr<cc::OutputSurface> delegated_output_surface =
       base::MakeUnique<cc::SurfaceDisplayOutputSurface>(
           compositor_dependencies_->GetSurfaceManager(),
           surface_id_allocator_.get(), display_.get(), context_provider,
           nullptr);
 
   host_->SetOutputSurface(std::move(delegated_output_surface));
 }
 
 }  // namespace client
 }  // namespace blimp