Revert of Make cc::Display not own its BeginFrameSource

ui/compositor/test/in_process_context_factory.cc

 // Copyright 2014 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 "ui/compositor/test/in_process_context_factory.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 81 matching lines @@
   }
 
  private:
   base::WeakPtrFactory<DirectOutputSurface> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectOutputSurface);
 };
 
 }  // namespace
 
-struct InProcessContextFactory::PerCompositorData {
-  std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source;
-  std::unique_ptr<cc::Display> display;
-};
-
 InProcessContextFactory::InProcessContextFactory(
     bool context_factory_for_test,
     cc::SurfaceManager* surface_manager)
     : next_surface_client_id_(1u),
       use_test_surface_(true),
       context_factory_for_test_(context_factory_for_test),
       surface_manager_(surface_manager) {
   DCHECK_NE(gl::GetGLImplementation(), gl::kGLImplementationNone)
       << "If running tests, ensure that main() is calling "
       << "gl::GLSurfaceTestSupport::InitializeOneOff()";
@@ skipping 49 matching lines @@
     bool flipped_output_surface = false;
     display_output_surface = base::MakeUnique<cc::PixelTestOutputSurface>(
         context_provider, shared_worker_context_provider_,
         flipped_output_surface);
   } else {
     display_output_surface = base::MakeUnique<DirectOutputSurface>(
         context_provider, shared_worker_context_provider_);
   }
 
   if (surface_manager_) {
-    auto data = base::MakeUnique<PerCompositorData>();
-    data->begin_frame_source.reset(new cc::DelayBasedBeginFrameSource(
-        base::MakeUnique<cc::DelayBasedTimeSource>(
-            compositor->task_runner().get())));
+    std::unique_ptr<cc::DelayBasedBeginFrameSource> begin_frame_source(
+        new cc::DelayBasedBeginFrameSource(
+            base::MakeUnique<cc::DelayBasedTimeSource>(
+                compositor->task_runner().get())));
     std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
-        data->begin_frame_source.get(), compositor->task_runner().get(),
+        begin_frame_source.get(), compositor->task_runner().get(),
         display_output_surface->capabilities().max_frames_pending));
-    data->display = base::MakeUnique<cc::Display>(
+    per_compositor_data_[compositor.get()] = base::MakeUnique<cc::Display>(
         GetSharedBitmapManager(), GetGpuMemoryBufferManager(),
-        compositor->GetRendererSettings(), data->begin_frame_source.get(),
+        compositor->GetRendererSettings(), std::move(begin_frame_source),
         std::move(display_output_surface), std::move(scheduler),
         base::MakeUnique<cc::TextureMailboxDeleter>(
             compositor->task_runner().get()));
+
+    auto* display = per_compositor_data_[compositor.get()].get();
     std::unique_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface(
         new cc::SurfaceDisplayOutputSurface(
-            surface_manager_, compositor->surface_id_allocator(),
-            data->display.get(), context_provider,
-            shared_worker_context_provider_));
-
-    per_compositor_data_[compositor.get()] = std::move(data);
+            surface_manager_, compositor->surface_id_allocator(), display,
+            context_provider, shared_worker_context_provider_));
     compositor->SetOutputSurface(std::move(surface_output_surface));
   } else {
     compositor->SetOutputSurface(std::move(display_output_surface));
   }
 }
 
 std::unique_ptr<Reflector> InProcessContextFactory::CreateReflector(
     Compositor* mirrored_compositor,
     Layer* mirroring_layer) {
   return base::WrapUnique(new FakeReflector);
@@ skipping 52 matching lines @@
 }
 
 cc::SurfaceManager* InProcessContextFactory::GetSurfaceManager() {
   return surface_manager_;
 }
 
 void InProcessContextFactory::SetDisplayVisible(ui::Compositor* compositor,
                                                 bool visible) {
   if (!per_compositor_data_.count(compositor))
     return;
-  per_compositor_data_[compositor]->display->SetVisible(visible);
+  per_compositor_data_[compositor]->SetVisible(visible);
 }
 
 void InProcessContextFactory::ResizeDisplay(ui::Compositor* compositor,
                                             const gfx::Size& size) {
   if (!per_compositor_data_.count(compositor))
     return;
-  per_compositor_data_[compositor]->display->Resize(size);
+  per_compositor_data_[compositor]->Resize(size);
 }
 
 void InProcessContextFactory::AddObserver(ContextFactoryObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void InProcessContextFactory::RemoveObserver(ContextFactoryObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 }  // namespace ui