cc:: Change plumbing for external_begin_frame_source to the Scheduler.

cc/trees/single_thread_proxy.h

Index: cc/trees/single_thread_proxy.h
diff --git a/cc/trees/single_thread_proxy.h b/cc/trees/single_thread_proxy.h
index a60f7139a9d50771e29e6b062654571fed47b770..b4aee1f4c526b55c58c70bfb92cfcd6687749509 100644
--- a/cc/trees/single_thread_proxy.h
+++ b/cc/trees/single_thread_proxy.h
@@ -28,11 +28,9 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
                                     NON_EXPORTED_BASE(LayerTreeHostImplClient),
                                     SchedulerClient {
  public:
-  static scoped_ptr<Proxy> Create(
-      LayerTreeHost* layer_tree_host,
-      LayerTreeHostSingleThreadClient* client,
-      TaskRunnerProvider* task_runner_provider_,
-      scoped_ptr<BeginFrameSource> external_begin_frame_source);
+  static scoped_ptr<Proxy> Create(LayerTreeHost* layer_tree_host,
+                                  LayerTreeHostSingleThreadClient* client,
+                                  TaskRunnerProvider* task_runner_provider_);
   ~SingleThreadProxy() override;
 
   // Proxy implementation
@@ -54,7 +52,7 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
   bool CommitRequested() const override;
   bool BeginMainFrameRequested() const override;
   void MainThreadHasStoppedFlinging() override {}
-  void Start() override;
+  void Start(scoped_ptr<BeginFrameSource> external_begin_frame_source) override;
   void Stop() override;
   bool SupportsImplScrolling() const override;
   bool MainFrameWillHappenForTesting() override;
@@ -120,8 +118,7 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
  protected:
   SingleThreadProxy(LayerTreeHost* layer_tree_host,
                     LayerTreeHostSingleThreadClient* client,
-                    TaskRunnerProvider* task_runner_provider,
-                    scoped_ptr<BeginFrameSource> external_begin_frame_source);
+                    TaskRunnerProvider* task_runner_provider);
 
  private:
   void BeginMainFrame(const BeginFrameArgs& begin_frame_args);
@@ -142,6 +139,9 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
 
   TaskRunnerProvider* task_runner_provider_;
 
+  const LayerTreeSettings settings_;
+  RenderingStatsInstrumentation* rendering_stats_instrumentation_;

[brianderson, 2015/12/10 23:06:02]

Don't think these are needed as member variables. They are only used once in
STP::Start and can be accessed from the layer_tree_host_ member variable.

[Khushal, 2015/12/11 02:37:40]

Done. I was thinking along the lines for when we unify the single-threaded case
to use a channel as well. But we pass the LTH to ProxyImpl for initialization as
well so it can pull these values from there then.

+
   // Used on the Thread, but checked on main thread during
   // initialization/shutdown.
   scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl_;