cc: Make BackToBackBeginFrameSource a SyntheticBeginFrameSource.

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 f3c6f9c3d8af422e19e2ea9fbe616c214b23f250..5c44ea6dd45349a359821a9f2666307a83dfe279 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h
@@ -40,23 +40,14 @@ class FakeDelayBasedTimeSourceClient : public DelayBasedTimeSourceClient {
 
 class FakeDelayBasedTimeSource : public DelayBasedTimeSource {
  public:
-  static std::unique_ptr<FakeDelayBasedTimeSource> Create(
-      base::TimeDelta interval,
-      base::SingleThreadTaskRunner* task_runner) {
-    return base::WrapUnique(
-        new FakeDelayBasedTimeSource(interval, task_runner));
-  }
-
+  explicit FakeDelayBasedTimeSource(base::SingleThreadTaskRunner* task_runner)
+      : DelayBasedTimeSource(task_runner) {}
   ~FakeDelayBasedTimeSource() override {}
 
   void SetNow(base::TimeTicks time) { now_ = time; }
   base::TimeTicks Now() const override;
 
  protected:
-  FakeDelayBasedTimeSource(base::TimeDelta interval,
-                           base::SingleThreadTaskRunner* task_runner)
-      : DelayBasedTimeSource(interval, task_runner) {}
-
   base::TimeTicks now_;
 
  private:
@@ -65,21 +56,11 @@ class FakeDelayBasedTimeSource : public DelayBasedTimeSource {
 
 class TestDelayBasedTimeSource : public DelayBasedTimeSource {
  public:
-  static std::unique_ptr<TestDelayBasedTimeSource> Create(
-      base::SimpleTestTickClock* now_src,
-      base::TimeDelta interval,
-      OrderedSimpleTaskRunner* task_runner) {
-    return base::WrapUnique(
-        new TestDelayBasedTimeSource(now_src, interval, task_runner));
-  }
-
-  ~TestDelayBasedTimeSource() override;
-
- protected:
   TestDelayBasedTimeSource(base::SimpleTestTickClock* now_src,
-                           base::TimeDelta interval,
                            OrderedSimpleTaskRunner* task_runner);
+  ~TestDelayBasedTimeSource() override;
 
+ protected:
   // Overridden from DelayBasedTimeSource
   base::TimeTicks Now() const override;
   std::string TypeString() const override;
@@ -115,30 +96,30 @@ class FakeBeginFrameSource : public BeginFrameSourceBase {
   DISALLOW_COPY_AND_ASSIGN(FakeBeginFrameSource);
 };
 
-class TestBackToBackBeginFrameSource : public BackToBackBeginFrameSource {
+class TestBackToBackBeginFrameSource : public BeginFrameSourceBase {

[enne (OOO), 2016/06/14 21:25:17]

Why can't this be a BackToBackBeginFrameSource? It looks like you replicate some
of the logic in the test class, which is a bit <_<

[danakj, 2016/06/14 21:53:23]

Oh, I did that first so I could ignore some tests. Let me try that.

[danakj, 2016/06/14 22:00:16]

It is now deleted.

  public:
   TestBackToBackBeginFrameSource(base::SimpleTestTickClock* now_src,
                                  base::SingleThreadTaskRunner* task_runner);
   ~TestBackToBackBeginFrameSource() override;
 
- protected:
-  base::TimeTicks Now() override;
-  // Not owned.
-  base::SimpleTestTickClock* now_src_;
+  // BeginFrameSourceBase overrides.
+  void AddObserver(BeginFrameObserver* obs) override;
+  void RemoveObserver(BeginFrameObserver* obs) override;
+  void DidFinishFrame(BeginFrameObserver* obs,
+                      size_t remaining_frames) override;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(TestBackToBackBeginFrameSource);
-};
+  base::TimeTicks Now();
+  void PostPendingBeginFramesTask();
+  void SendPendingBeginFrames();
 
-class TestSyntheticBeginFrameSource : public SyntheticBeginFrameSource {
- public:
-  explicit TestSyntheticBeginFrameSource(base::SimpleTestTickClock* now_src,
-                                         OrderedSimpleTaskRunner* task_runner,
-                                         base::TimeDelta initial_interval);
-  ~TestSyntheticBeginFrameSource() override;
+  base::SimpleTestTickClock* now_src_;
+  base::SingleThreadTaskRunner* task_runner_;
+  base::CancelableClosure begin_frame_task_;
+  std::set<BeginFrameObserver*> pending_begin_frame_observers_;
+  base::WeakPtrFactory<TestBackToBackBeginFrameSource> weak_factory_;
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(TestSyntheticBeginFrameSource);
+  DISALLOW_COPY_AND_ASSIGN(TestBackToBackBeginFrameSource);
 };
 
 class FakeCompositorTimingHistory : public CompositorTimingHistory {