cc: Remove BeginFrameSourcesConstructor.

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 f9ca3ae524cd7484a89feef69037d94d28483237..807d709d090dd9cc7fe4388b13cceb04cdb5fd09 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h
@@ -133,28 +133,6 @@ class TestSyntheticBeginFrameSource : public SyntheticBeginFrameSource {
       scoped_refptr<DelayBasedTimeSource> time_source);
 };
 
-class TestScheduler;
-class TestSchedulerFrameSourcesConstructor
-    : public SchedulerFrameSourcesConstructor {
- public:
-  ~TestSchedulerFrameSourcesConstructor() override;
-
- protected:
-  BeginFrameSource* ConstructPrimaryFrameSource(Scheduler* scheduler) override;
-  BeginFrameSource* ConstructUnthrottledFrameSource(
-      Scheduler* scheduler) override;
-
-  OrderedSimpleTaskRunner* test_task_runner_;
-  // Not owned.
-  base::SimpleTestTickClock* now_src_;
-
- protected:
-  explicit TestSchedulerFrameSourcesConstructor(
-      OrderedSimpleTaskRunner* test_task_runner,
-      base::SimpleTestTickClock* now_src);
-  friend class TestScheduler;
-};
-
 class TestScheduler : public Scheduler {
  public:
   static scoped_ptr<TestScheduler> Create(
@@ -162,19 +140,8 @@ class TestScheduler : public Scheduler {
       SchedulerClient* client,
       const SchedulerSettings& scheduler_settings,
       int layer_tree_host_id,
-      const scoped_refptr<OrderedSimpleTaskRunner>& task_runner,
-      scoped_ptr<BeginFrameSource> external_begin_frame_source) {
-    TestSchedulerFrameSourcesConstructor frame_sources_constructor(
-        task_runner.get(), now_src);
-    return make_scoped_ptr(new TestScheduler(
-                                   now_src,
-                                   client,
-                                   scheduler_settings,
-                                   layer_tree_host_id,
-                                   task_runner,
-                                   &frame_sources_constructor,
-                                   external_begin_frame_source.Pass()));
-  }
+      OrderedSimpleTaskRunner* task_runner,
+      BeginFrameSource* external_frame_source);
 
   // Extra test helper functionality
   bool IsBeginRetroFrameArgsEmpty() const {
@@ -204,13 +171,15 @@ class TestScheduler : public Scheduler {
   base::TimeTicks Now() const override;
 
  private:
-  TestScheduler(base::SimpleTestTickClock* now_src,
-                SchedulerClient* client,
-                const SchedulerSettings& scheduler_settings,
-                int layer_tree_host_id,
-                const scoped_refptr<OrderedSimpleTaskRunner>& test_task_runner,
-                TestSchedulerFrameSourcesConstructor* frame_sources_constructor,
-                scoped_ptr<BeginFrameSource> external_begin_frame_source);
+  TestScheduler(
+      base::SimpleTestTickClock* now_src,
+      SchedulerClient* client,
+      const SchedulerSettings& scheduler_settings,
+      int layer_tree_host_id,
+      OrderedSimpleTaskRunner* task_runner,
+      BeginFrameSource* external_frame_source,
+      scoped_ptr<TestSyntheticBeginFrameSource> synthetic_frame_source,
+      scoped_ptr<TestBackToBackBeginFrameSource> unthrottled_frame_source);
 
   // Not owned.
   base::SimpleTestTickClock* now_src_;