Revert of Make cc::Display not own its BeginFrameSource

services/ui/surfaces/display_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 "services/ui/surfaces/display_compositor.h"
 
 #include "cc/output/copy_output_request.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/renderer_settings.h"
 #include "cc/output/texture_mailbox_deleter.h"
@@ skipping 25 matching lines @@
   surfaces_state_->manager()->RegisterSurfaceFactoryClient(
       allocator_.client_id(), this);
 
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager =
       gpu_channel->gpu_memory_buffer_manager();
   scoped_refptr<SurfacesContextProvider> surfaces_context_provider(
       new SurfacesContextProvider(widget, std::move(gpu_channel)));
   // TODO(rjkroege): If there is something better to do than CHECK, add it.
   CHECK(surfaces_context_provider->BindToCurrentThread());
 
-  synthetic_begin_frame_source_.reset(new cc::DelayBasedBeginFrameSource(
-      base::MakeUnique<cc::DelayBasedTimeSource>(task_runner_.get())));
+  std::unique_ptr<cc::SyntheticBeginFrameSource> synthetic_begin_frame_source(
+      new cc::DelayBasedBeginFrameSource(
+          base::MakeUnique<cc::DelayBasedTimeSource>(task_runner_.get())));
 
   std::unique_ptr<cc::OutputSurface> display_output_surface;
   if (surfaces_context_provider->ContextCapabilities().surfaceless) {
 #if defined(USE_OZONE)
     display_output_surface = base::MakeUnique<DirectOutputSurfaceOzone>(
-        surfaces_context_provider, widget, synthetic_begin_frame_source_.get(),
+        surfaces_context_provider, widget, synthetic_begin_frame_source.get(),
         gpu_memory_buffer_manager, GL_TEXTURE_2D, GL_RGB);
 #else
     NOTREACHED();
 #endif
   } else {
     display_output_surface = base::MakeUnique<DirectOutputSurface>(
-        surfaces_context_provider, synthetic_begin_frame_source_.get());
+        surfaces_context_provider, synthetic_begin_frame_source.get());
   }
 
   int max_frames_pending =
       display_output_surface->capabilities().max_frames_pending;
   DCHECK_GT(max_frames_pending, 0);
 
   std::unique_ptr<cc::DisplayScheduler> scheduler(
-      new cc::DisplayScheduler(synthetic_begin_frame_source_.get(),
+      new cc::DisplayScheduler(synthetic_begin_frame_source.get(),
                                task_runner_.get(), max_frames_pending));
 
   display_.reset(new cc::Display(
       nullptr /* bitmap_manager */, gpu_memory_buffer_manager,
-      cc::RendererSettings(), synthetic_begin_frame_source_.get(),
+      cc::RendererSettings(), std::move(synthetic_begin_frame_source),
       std::move(display_output_surface), std::move(scheduler),
       base::MakeUnique<cc::TextureMailboxDeleter>(task_runner_.get())));
   display_->Initialize(this, surfaces_state_->manager(),
                        allocator_.client_id());
   display_->SetVisible(true);
 }
 
 DisplayCompositor::~DisplayCompositor() {
   surfaces_state_->manager()->UnregisterSurfaceFactoryClient(
       allocator_.client_id());
@@ skipping 47 matching lines @@
   // This notification is not relevant to our client outside of tests.
 }
 
 void DisplayCompositor::DisplayDidDrawAndSwap() {
   // This notification is not relevant to our client outside of tests. We
   // unblock the client from the DrawCallback when the surface is going to
   // be drawn.
 }
 
 }  // namespace ui