cc: Remove BeginFrameSourcesConstructor.

cc/test/scheduler_test_common.h

 // Copyright 2011 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.
 
 #ifndef CC_TEST_SCHEDULER_TEST_COMMON_H_
 #define CC_TEST_SCHEDULER_TEST_COMMON_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 115 matching lines @@
     return make_scoped_ptr(
         new TestSyntheticBeginFrameSource(TestDelayBasedTimeSource::Create(
             now_src, initial_interval, task_runner)));
   }
 
  protected:
   TestSyntheticBeginFrameSource(
       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(
       base::SimpleTestTickClock* now_src,
       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 {
     return begin_retro_frame_args_.empty();
   }
 
   bool CanStart() const { return state_machine_.CanStartForTesting(); }
 
   BeginFrameSource& frame_source() { return *frame_source_; }
   bool FrameProductionThrottled() { return throttle_frame_production_; }
 
   ~TestScheduler() override;
 
   void NotifyReadyToCommitThenActivateIfNeeded() {
     NotifyReadyToCommit();
     if (settings_.impl_side_painting) {
       NotifyReadyToActivate();
     }
   }
 
   base::TimeDelta BeginImplFrameInterval() {
     return begin_impl_frame_tracker_.Interval();
   }
 
  protected:
   // Overridden from 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_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_SCHEDULER_TEST_COMMON_H_