cc:: Change plumbing for external_begin_frame_source to the Scheduler.

cc/trees/proxy_main.cc

Index: cc/trees/proxy_main.cc
diff --git a/cc/trees/proxy_main.cc b/cc/trees/proxy_main.cc
index dd5ac1afe5e6784188386ddec36905c46af43d1d..2c624386da29c7be251bc19a3ee3a5069c265343 100644
--- a/cc/trees/proxy_main.cc
+++ b/cc/trees/proxy_main.cc
@@ -23,19 +23,16 @@ namespace cc {
 
 scoped_ptr<ProxyMain> ProxyMain::CreateThreaded(
     LayerTreeHost* layer_tree_host,
-    TaskRunnerProvider* task_runner_provider,
-    scoped_ptr<BeginFrameSource> external_begin_frame_source) {
+    TaskRunnerProvider* task_runner_provider) {
   scoped_ptr<ProxyMain> proxy_main(
-      new ProxyMain(layer_tree_host, task_runner_provider,
-                    std::move(external_begin_frame_source)));
+      new ProxyMain(layer_tree_host, task_runner_provider));
   proxy_main->SetChannel(
       ThreadedChannel::Create(proxy_main.get(), task_runner_provider));
   return proxy_main;
 }
 
 ProxyMain::ProxyMain(LayerTreeHost* layer_tree_host,
-                     TaskRunnerProvider* task_runner_provider,
-                     scoped_ptr<BeginFrameSource> external_begin_frame_source)
+                     TaskRunnerProvider* task_runner_provider)
     : layer_tree_host_(layer_tree_host),
       task_runner_provider_(task_runner_provider),
       layer_tree_host_id_(layer_tree_host->id()),
@@ -44,13 +41,10 @@ ProxyMain::ProxyMain(LayerTreeHost* layer_tree_host,
       final_pipeline_stage_(NO_PIPELINE_STAGE),
       commit_waits_for_activation_(false),
       started_(false),
-      defer_commits_(false),
-      external_begin_frame_source_(std::move(external_begin_frame_source)) {
+      defer_commits_(false) {
   TRACE_EVENT0("cc", "ProxyMain::ProxyMain");
   DCHECK(task_runner_provider_);
   DCHECK(IsMainThread());
-  DCHECK(!layer_tree_host_->settings().use_external_begin_frame_source ||

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

Can you keep this DCHECK in ProxyMain::Start?

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

Done.

-         external_begin_frame_source_);
 }
 
 ProxyMain::~ProxyMain() {
@@ -380,14 +374,15 @@ void ProxyMain::MainThreadHasStoppedFlinging() {
   channel_main_->MainThreadHasStoppedFlingingOnImpl();
 }
 
-void ProxyMain::Start() {
+void ProxyMain::Start(
+    scoped_ptr<BeginFrameSource> external_begin_frame_source) {
   DCHECK(IsMainThread());
   DCHECK(task_runner_provider_->HasImplThread());
   DCHECK(channel_main_);
 
   // Create LayerTreeHostImpl.
   channel_main_->SynchronouslyInitializeImpl(
-      layer_tree_host_, std::move(external_begin_frame_source_));
+      layer_tree_host_, std::move(external_begin_frame_source));
 
   started_ = true;
 }