Get rid of virtual Display::CreateScheduler.

cc/test/pixel_test_delegating_output_surface.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 "cc/test/pixel_test_delegating_output_surface.h"
 
 #include <stdint.h>
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/direct_renderer.h"
+#include "cc/output/texture_mailbox_deleter.h"
+#include "cc/scheduler/begin_frame_source.h"
 #include "cc/scheduler/delay_based_time_source.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/pixel_test_output_surface.h"
 #include "cc/test/pixel_test_software_output_device.h"
 #include "cc/test/test_in_process_context_provider.h"
 
 static constexpr uint32_t kCompositorSurfaceNamespace = 1;
 
 namespace cc {
 
@@ skipping 36 matching lines @@
   gfx::Size surface_expansion_size(40, 60);
 
   // The PixelTestOutputSurface is owned by the Display.
   std::unique_ptr<PixelTestOutputSurface> output_surface;
 
   if (!context_provider()) {
     std::unique_ptr<PixelTestSoftwareOutputDevice> software_output_device(
         new PixelTestSoftwareOutputDevice);
     software_output_device->set_surface_expansion_size(surface_expansion_size);
     output_surface = base::MakeUnique<PixelTestOutputSurface>(
-        std::move(software_output_device), nullptr);
+        std::move(software_output_device));
   } else {
     scoped_refptr<TestInProcessContextProvider> context(
         new TestInProcessContextProvider(nullptr));
     bool flipped_output_surface = false;
     output_surface = base::MakeUnique<PixelTestOutputSurface>(
-        std::move(context), nullptr, flipped_output_surface, nullptr);
+        std::move(context), nullptr, flipped_output_surface);
   }
   output_surface->set_surface_expansion_size(surface_expansion_size);
 
   auto* task_runner = base::ThreadTaskRunnerHandle::Get().get();
   CHECK(task_runner);
 
-  display_.reset(new Display(surface_manager_.get(), shared_bitmap_manager_,
-                             gpu_memory_buffer_manager_, RendererSettings(),
-                             surface_id_allocator_->id_namespace(), task_runner,
-                             std::move(output_surface)));
+  std::unique_ptr<SyntheticBeginFrameSource> begin_frame_source;
+  std::unique_ptr<DisplayScheduler> scheduler;
+  if (!synchronous_composite_) {
+    begin_frame_source.reset(new BackToBackBeginFrameSource(
+        base::MakeUnique<DelayBasedTimeSource>(task_runner)));
+    scheduler.reset(new DisplayScheduler(
+        begin_frame_source.get(), task_runner,
+        output_surface->capabilities().max_frames_pending));
+  }
+
+  display_.reset(new Display(
+      surface_manager_.get(), shared_bitmap_manager_,
+      gpu_memory_buffer_manager_, RendererSettings(),
+      surface_id_allocator_->id_namespace(), std::move(begin_frame_source),
+      std::move(output_surface), std::move(scheduler),
+      base::MakeUnique<TextureMailboxDeleter>(task_runner)));
   display_->SetEnlargePassTextureAmountForTesting(enlarge_pass_texture_amount_);
 
-  if (synchronous_composite_) {
-    bool init = display_->InitializeSynchronous(&display_client_);
-    CHECK(init);
-  } else {
-    begin_frame_source_.reset(new BackToBackBeginFrameSource(
-        base::MakeUnique<DelayBasedTimeSource>(task_runner)));
-    display_->SetBeginFrameSource(begin_frame_source_.get());
-
-    bool init = display_->Initialize(&display_client_);
-    CHECK(init);
-  }
-
+  bool init = display_->Initialize(&display_client_);
+  CHECK(init);
   return true;
 }
 
 void PixelTestDelegatingOutputSurface::DetachFromClient() {
   if (!delegated_surface_id_.is_null())
     surface_factory_->Destroy(delegated_surface_id_);
   surface_manager_->UnregisterSurfaceFactoryClient(
       surface_id_allocator_->id_namespace());
 
   display_ = nullptr;
@@ skipping 52 matching lines @@
   ack.resources = resources;
   client_->ReclaimResources(&ack);
 }
 
 void PixelTestDelegatingOutputSurface::SetBeginFrameSource(
     BeginFrameSource* begin_frame_source) {
   client_->SetBeginFrameSource(begin_frame_source);
 }
 
 }  // namespace cc