Hoist begin frame sources out of scheduler

cc/scheduler/scheduler.h

Index: cc/scheduler/scheduler.h
diff --git a/cc/scheduler/scheduler.h b/cc/scheduler/scheduler.h
index a5a6bd473c06866c6e81938c2c6efc40f98dd96f..eca5b8992d0d531ce405373943c128da5b668b33 100644
--- a/cc/scheduler/scheduler.h
+++ b/cc/scheduler/scheduler.h
@@ -60,7 +60,7 @@ class CC_EXPORT Scheduler : public BeginFrameObserverBase {
       const SchedulerSettings& scheduler_settings,
       int layer_tree_host_id,
       base::SingleThreadTaskRunner* task_runner,
-      BeginFrameSource* external_frame_source,
+      BeginFrameSource* begin_frame_source,
       scoped_ptr<CompositorTimingHistory> compositor_timing_history);
 
   ~Scheduler() override;
@@ -73,8 +73,6 @@ class CC_EXPORT Scheduler : public BeginFrameObserverBase {
 
   const SchedulerSettings& settings() const { return settings_; }
 
-  void CommitVSyncParameters(base::TimeTicks timebase,
-                             base::TimeDelta interval);
   void SetEstimatedParentDrawTime(base::TimeDelta draw_time);
 
   void SetVisible(bool visible);
@@ -142,16 +140,12 @@ class CC_EXPORT Scheduler : public BeginFrameObserverBase {
   void SetChildrenNeedBeginFrames(bool children_need_begin_frames);
   void SetVideoNeedsBeginFrames(bool video_needs_begin_frames);
 
-  void SetAuthoritativeVSyncInterval(const base::TimeDelta& interval);
-
  protected:
   Scheduler(SchedulerClient* client,
             const SchedulerSettings& scheduler_settings,
             int layer_tree_host_id,
             base::SingleThreadTaskRunner* task_runner,
-            BeginFrameSource* external_frame_source,
-            scoped_ptr<SyntheticBeginFrameSource> synthetic_frame_source,
-            scoped_ptr<BackToBackBeginFrameSource> unthrottled_frame_source,
+            BeginFrameSource* begin_frame_source,
             scoped_ptr<CompositorTimingHistory> compositor_timing_history);
 
   // Virtual for testing.
@@ -161,16 +155,10 @@ class CC_EXPORT Scheduler : public BeginFrameObserverBase {
   SchedulerClient* client_;
   int layer_tree_host_id_;
   base::SingleThreadTaskRunner* task_runner_;
-  BeginFrameSource* external_frame_source_;
-  scoped_ptr<SyntheticBeginFrameSource> synthetic_frame_source_;
-  scoped_ptr<BackToBackBeginFrameSource> unthrottled_frame_source_;
 
-  scoped_ptr<BeginFrameSourceMultiplexer> frame_source_;
+  BeginFrameSource* frame_source_;

[Sami, 2016/03/08 19:15:25]

nit: Could you add "  // Not owned." to make it clear we don't manage the
source's lifetime?

double-nit: maybe also rename to begin_frame_source_ for consistency?

   bool observing_frame_source_;
 
-  base::TimeDelta authoritative_vsync_interval_;
-  base::TimeTicks last_vsync_timebase_;
-
   scoped_ptr<CompositorTimingHistory> compositor_timing_history_;
   base::TimeDelta estimated_parent_draw_time_;
 
@@ -224,14 +212,6 @@ class CC_EXPORT Scheduler : public BeginFrameObserverBase {
     return inside_action_ == action;
   }
 
-  BeginFrameSource* primary_frame_source() {
-    if (settings_.use_external_begin_frame_source) {
-      DCHECK(external_frame_source_);
-      return external_frame_source_;
-    }
-    return synthetic_frame_source_.get();
-  }
-
   base::WeakPtrFactory<Scheduler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Scheduler);