cc: Remove retro frame logic from scheduler.

cc/test/scheduler_test_common.h

Index: cc/test/scheduler_test_common.h
diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h
index 8bb8a9d565875f8e53dc4b7fba6042c7f01eb7db..f3aeb940b14fae71f661ea9b226b42a33edc98dd 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h
@@ -130,10 +130,6 @@ class TestScheduler : public Scheduler {
       std::unique_ptr<CompositorTimingHistory> compositor_timing_history);
 
   // Extra test helper functionality
-  bool IsBeginRetroFrameArgsEmpty() const {
-    return begin_retro_frame_args_.empty();
-  }
-
   bool SwapThrottled() const { return state_machine_.SwapThrottled(); }
 
   bool NeedsBeginMainFrame() const {
@@ -150,6 +146,8 @@ class TestScheduler : public Scheduler {
     return begin_frame_source_ && observing_begin_frame_source_;
   }
 
+  base::Callback<bool(void)> InCurrentFrame() const;
+
   ~TestScheduler() override;
 
   base::TimeDelta BeginImplFrameInterval() {
@@ -164,12 +162,17 @@ class TestScheduler : public Scheduler {
     state_machine_.SetCriticalBeginMainFrameToActivateIsFast(is_fast);
   }
 
+  bool OnBeginFrameDerivedImpl(const BeginFrameArgs& args) override;
+
  protected:
   // Overridden from Scheduler.
   base::TimeTicks Now() const override;
 
  private:
+  bool InCurrentFrameCallback(int num_begin_frames) const;
+
   base::SimpleTestTickClock* now_src_;
+  int num_begin_frames_;
 
   DISALLOW_COPY_AND_ASSIGN(TestScheduler);
 };