Refactoring the way begin frame sources inside scheduler work.

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 a50233653410836c44189d5d53381dfaf0d6d3b3..e7b282681833ee4b2cf1f80209d2e205dd2f97ac 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h
@@ -27,7 +27,7 @@ class FakeTimeSourceClient : public TimeSourceClient {
   virtual void OnTimerTick() OVERRIDE;
 
  protected:
-  bool tick_called_;
+  bool tick_called_ = false;
 };
 
 class FakeDelayBasedTimeSource : public DelayBasedTimeSource {
@@ -73,6 +73,66 @@ class TestDelayBasedTimeSource : public DelayBasedTimeSource {
   scoped_refptr<TestNowSource> now_src_;
 };
 
+struct FakeBeginFrameSource : public BeginFrameSource {
+  bool needs_begin_frames_ = false;
+  bool remaining_frames_ = false;
+
+  BeginFrameObserver* GetObserver() { return observer_; }
+
+  void TestSendBeginFrame(const BeginFrameArgs& args) { SendBeginFrame(args); }
+
+  // BeginFrameSource
+  virtual bool NeedsBeginFrames() const OVERRIDE;
+  virtual void SetNeedsBeginFrames(bool needs_begin_frames) OVERRIDE;
+  virtual void DidFinishFrame(size_t remaining_frames) OVERRIDE;
+
+  virtual void AsValueInto(base::debug::TracedValue* dict) const OVERRIDE;
+
+  virtual ~FakeBeginFrameSource() {}
+};
+
+class TestBackToBackBeginFrameSource : public BackToBackBeginFrameSource {
+ public:
+  virtual ~TestBackToBackBeginFrameSource();
+
+  static scoped_ptr<TestBackToBackBeginFrameSource> Create(
+      scoped_refptr<TestNowSource> now_src,
+      base::SingleThreadTaskRunner* task_runner) {
+    return make_scoped_ptr(
+        new TestBackToBackBeginFrameSource(now_src, task_runner));
+  }
+
+ protected:
+  TestBackToBackBeginFrameSource(scoped_refptr<TestNowSource> now_src,
+                                 base::SingleThreadTaskRunner* task_runner);
+
+  virtual base::TimeTicks Now() OVERRIDE;
+
+  scoped_refptr<TestNowSource> now_src_;
+};
+
+class TestSyntheticBeginFrameSource : public SyntheticBeginFrameSource {
+ public:
+  virtual ~TestSyntheticBeginFrameSource();
+
+  static scoped_ptr<TestSyntheticBeginFrameSource> Create(
+      scoped_refptr<TestNowSource> now_src,
+      OrderedSimpleTaskRunner* task_runner,
+      base::TimeDelta initial_interval) {
+    base::TimeTicks initial_timebase = now_src->Now();
+    return make_scoped_ptr(new TestSyntheticBeginFrameSource(
+        TestDelayBasedTimeSource::Create(
+            now_src, initial_interval, task_runner),
+        initial_timebase,
+        initial_interval));
+  }
+
+ protected:
+  TestSyntheticBeginFrameSource(scoped_refptr<DelayBasedTimeSource> time_source,
+                                base::TimeTicks initial_timebase,
+                                base::TimeDelta initial_interval);
+};
+
 class TestScheduler : public Scheduler {
  public:
   static scoped_ptr<TestScheduler> Create(
@@ -85,11 +145,14 @@ class TestScheduler : public Scheduler {
 
     scoped_refptr<OrderedSimpleTaskRunner> test_task_runner =
         new OrderedSimpleTaskRunner(now_src, true);
-    return make_scoped_ptr(new TestScheduler(now_src,
-                                             client,
-                                             scheduler_settings,
-                                             layer_tree_host_id,
-                                             test_task_runner));
+    scoped_ptr<TestScheduler> scheduler =
+        make_scoped_ptr(new TestScheduler(now_src,
+                                          client,
+                                          scheduler_settings,
+                                          layer_tree_host_id,
+                                          test_task_runner));
+    scheduler->FinalizeSetup();
+    return scheduler.Pass();
   }
 
   // Extra test helper functionality
@@ -97,10 +160,7 @@ class TestScheduler : public Scheduler {
     return begin_retro_frame_args_.empty();
   }
 
-  bool IsSyntheticBeginFrameSourceActive() const {
-    return synthetic_begin_frame_source_->IsActive();
-  }
-
+  BeginFrameSource& frame_source() { return *frame_source_; }
   OrderedSimpleTaskRunner& task_runner() { return *test_task_runner_; }
 
   virtual ~TestScheduler();
@@ -108,6 +168,8 @@ class TestScheduler : public Scheduler {
  protected:
   // Overridden from Scheduler.
   virtual base::TimeTicks Now() const OVERRIDE;
+  virtual BeginFrameSource* GetPrimaryBeginFrameSource() OVERRIDE;
+  virtual BeginFrameSource* GetBackgroundBeginFrameSource() OVERRIDE;
 
  private:
   TestScheduler(scoped_refptr<TestNowSource> now_src,