Hook up ui::Compositor to Display's BeginFrameSource

cc/surfaces/display_scheduler_unittest.cc

 // Copyright 2015 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/surfaces/display_scheduler.h"
 
 #include "base/logging.h"
 #include "base/test/null_task_runner.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 10 matching lines @@
 class FakeDisplaySchedulerClient : public DisplaySchedulerClient {
  public:
   FakeDisplaySchedulerClient() : draw_and_swap_count_(0) {}
 
   ~FakeDisplaySchedulerClient() override {}
 
   bool DrawAndSwap() override {
     draw_and_swap_count_++;
     return true;
   }
+  void UpdateSchedulerBeginFrameSource(BeginFrameSource* source) override {}
 
   void Reset() { draw_and_swap_count_ = 0; }
 
   int draw_and_swap_count() const { return draw_and_swap_count_; }
 
  protected:
   int draw_and_swap_count_;
 };
 
 class TestDisplayScheduler : public DisplayScheduler {
  public:
   TestDisplayScheduler(DisplaySchedulerClient* client,
                        BeginFrameSource* begin_frame_source,
                        base::SingleThreadTaskRunner* task_runner,
-                       int max_pending_swaps)
+                       int max_pending_swaps,
+                       const RendererSettings& settings)
       : DisplayScheduler(client,
                          begin_frame_source,
                          task_runner,
-                         max_pending_swaps),
+                         max_pending_swaps,
+                         settings),
         scheduler_begin_frame_deadline_count_(0) {}
 
   base::TimeTicks DesiredBeginFrameDeadlineTimeForTest() {
     return DesiredBeginFrameDeadlineTime();
   }
 
   void BeginFrameDeadlineForTest() { OnBeginFrameDeadline(); }
 
   void ScheduleBeginFrameDeadline() override {
     scheduler_begin_frame_deadline_count_++;
@@ skipping 10 matching lines @@
 
 class DisplaySchedulerTest : public testing::Test {
  public:
   DisplaySchedulerTest()
       : now_src_(new base::SimpleTestTickClock()),
         task_runner_(new base::NullTaskRunner),
         client_(new FakeDisplaySchedulerClient),
         scheduler_(new TestDisplayScheduler(client_.get(),
                                             &fake_begin_frame_source_,
                                             task_runner_.get(),
-                                            kMaxPendingSwaps)) {
+                                            kMaxPendingSwaps,
+                                            settings_)) {
     now_src_->Advance(base::TimeDelta::FromMicroseconds(10000));
   }
 
   ~DisplaySchedulerTest() override {}
 
   void SetUp() override { scheduler_->SetRootSurfaceResourcesLocked(false); }
 
   void BeginFrameForTest() {
     base::TimeTicks frame_time = now_src_->NowTicks();
     base::TimeDelta interval = BeginFrameArgs::DefaultInterval();
     base::TimeTicks deadline = frame_time + interval;
     fake_begin_frame_source_.TestOnBeginFrame(
         BeginFrameArgs::Create(BEGINFRAME_FROM_HERE, frame_time, deadline,
                                interval, BeginFrameArgs::NORMAL));
   }
 
  protected:
   base::SimpleTestTickClock& now_src() { return *now_src_; }
   FakeDisplaySchedulerClient& client() { return *client_; }
   DisplayScheduler& scheduler() { return *scheduler_; }
 
   FakeBeginFrameSource fake_begin_frame_source_;
+  RendererSettings settings_;
 
   scoped_ptr<base::SimpleTestTickClock> now_src_;
   scoped_refptr<base::NullTaskRunner> task_runner_;
   scoped_ptr<FakeDisplaySchedulerClient> client_;
   scoped_ptr<TestDisplayScheduler> scheduler_;
 };
 
 TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilNewRootSurface) {
   SurfaceId root_surface_id1(1);
   SurfaceId root_surface_id2(2);
@@ skipping 324 matching lines @@
 
   scheduler_->SetRootSurfaceResourcesLocked(true);
   EXPECT_EQ(count++, scheduler_->scheduler_begin_frame_deadline_count());
 
   scheduler_->OutputSurfaceLost();
   EXPECT_EQ(count++, scheduler_->scheduler_begin_frame_deadline_count());
 }
 
 }  // namespace
 }  // namespace cc