cc: Remove retro frame logic from scheduler.

cc/test/scheduler_test_common.cc

 // Copyright 2012 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/scheduler_test_common.h"
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
 
 namespace cc {
 
 void FakeDelayBasedTimeSourceClient::OnTimerTick() {
   tick_called_ = true;
 }
 
-base::TimeTicks FakeDelayBasedTimeSource::Now() const { return now_; }
+base::TimeTicks FakeDelayBasedTimeSource::Now() const {
+  return now_;
+}
 
 TestDelayBasedTimeSource::TestDelayBasedTimeSource(
     base::SimpleTestTickClock* now_src,
     OrderedSimpleTaskRunner* task_runner)
     : DelayBasedTimeSource(task_runner), now_src_(now_src) {}
 
 base::TimeTicks TestDelayBasedTimeSource::Now() const {
   return now_src_->NowTicks();
 }
 
 std::string TestDelayBasedTimeSource::TypeString() const {
   return "TestDelayBasedTimeSource";
 }
 
-TestDelayBasedTimeSource::~TestDelayBasedTimeSource() {
-}
+TestDelayBasedTimeSource::~TestDelayBasedTimeSource() {}
 
 std::unique_ptr<FakeCompositorTimingHistory>
 FakeCompositorTimingHistory::Create(
     bool using_synchronous_renderer_compositor) {
   std::unique_ptr<RenderingStatsInstrumentation>
       rendering_stats_instrumentation = RenderingStatsInstrumentation::Create();
   return base::WrapUnique(new FakeCompositorTimingHistory(
       using_synchronous_renderer_compositor,
       std::move(rendering_stats_instrumentation)));
 }
 
 FakeCompositorTimingHistory::FakeCompositorTimingHistory(
     bool using_synchronous_renderer_compositor,
     std::unique_ptr<RenderingStatsInstrumentation>
         rendering_stats_instrumentation)
     : CompositorTimingHistory(using_synchronous_renderer_compositor,
                               CompositorTimingHistory::NULL_UMA,
                               rendering_stats_instrumentation.get()),
       rendering_stats_instrumentation_owned_(
           std::move(rendering_stats_instrumentation)) {}
 
-FakeCompositorTimingHistory::~FakeCompositorTimingHistory() {
-}
+FakeCompositorTimingHistory::~FakeCompositorTimingHistory() {}
 
 void FakeCompositorTimingHistory::SetAllEstimatesTo(base::TimeDelta duration) {
   begin_main_frame_queue_duration_critical_ = duration;
   begin_main_frame_queue_duration_not_critical_ = duration;
   begin_main_frame_start_to_commit_duration_ = duration;
   commit_to_ready_to_activate_duration_ = duration;
   prepare_tiles_duration_ = duration;
   activate_duration_ = duration;
   draw_duration_ = duration;
 }
@@ skipping 77 matching lines @@
     int layer_tree_host_id,
     OrderedSimpleTaskRunner* task_runner,
     BeginFrameSource* begin_frame_source,
     std::unique_ptr<CompositorTimingHistory> compositor_timing_history)
     : Scheduler(client,
                 scheduler_settings,
                 layer_tree_host_id,
                 task_runner,
                 begin_frame_source,
                 std::move(compositor_timing_history)),
-      now_src_(now_src) {}
+      now_src_(now_src),
+      num_begin_frames_(0) {}
 
 base::TimeTicks TestScheduler::Now() const {
   return now_src_->NowTicks();
 }
 
-TestScheduler::~TestScheduler() {
+bool TestScheduler::OnBeginFrameDerivedImpl(const BeginFrameArgs& args) {
+  num_begin_frames_++;
+  return Scheduler::OnBeginFrameDerivedImpl(args);
 }
 
+base::Callback<bool(void)> TestScheduler::InCurrentFrame() const {
+  return base::Bind(&TestScheduler::InCurrentFrameCallback,
+                    base::Unretained(this), num_begin_frames_);
+}
+
+bool TestScheduler::InCurrentFrameCallback(int num_begin_frames) const {
+  return num_begin_frames_ == num_begin_frames;
+}
+
+TestScheduler::~TestScheduler() {}
+
 }  // namespace cc