Unified BeginFrame scheduling

cc/trees/single_thread_proxy.cc

Index: cc/trees/single_thread_proxy.cc
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
index fe9c34f8e7b26a7d93d8524febcbf7e00736afc4..cc9052a225ef0f709d2c160df151dce3d0d193e0 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -23,16 +23,21 @@ namespace cc {
 scoped_ptr<Proxy> SingleThreadProxy::Create(
     LayerTreeHost* layer_tree_host,
     LayerTreeHostSingleThreadClient* client,
-    scoped_refptr<base::SingleThreadTaskRunner> main_task_runner) {
+    scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
+    BeginFrameManager* begin_frame_manager) {
   return make_scoped_ptr(
-             new SingleThreadProxy(layer_tree_host, client, main_task_runner))
+             new SingleThreadProxy(layer_tree_host,
+                                   client,
+                                   main_task_runner,
+                                   begin_frame_manager))
       .PassAs<Proxy>();
 }
 
 SingleThreadProxy::SingleThreadProxy(
     LayerTreeHost* layer_tree_host,
     LayerTreeHostSingleThreadClient* client,
-    scoped_refptr<base::SingleThreadTaskRunner> main_task_runner)
+    scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
+    BeginFrameManager* begin_frame_manager)
     : Proxy(main_task_runner, NULL),
       layer_tree_host_(layer_tree_host),
       client_(client),
@@ -42,6 +47,7 @@ SingleThreadProxy::SingleThreadProxy(
       defer_commits_(false),
       commit_was_deferred_(false),
       commit_requested_(false),
+      begin_frame_manager_(begin_frame_manager),
       weak_factory_(this) {
   TRACE_EVENT0("cc", "SingleThreadProxy::SingleThreadProxy");
   DCHECK(Proxy::IsMainThread());
@@ -90,7 +96,8 @@ void SingleThreadProxy::SetLayerTreeHostClientReady() {
     scheduler_on_impl_thread_ = Scheduler::Create(this,
                                                   scheduler_settings,
                                                   layer_tree_host_->id(),
-                                                  MainThreadTaskRunner());
+                                                  MainThreadTaskRunner(),
+                                                  begin_frame_manager_);
     scheduler_on_impl_thread_->SetCanStart();
     scheduler_on_impl_thread_->SetVisible(layer_tree_host_impl_->visible());
   }