Unified BeginFrame scheduling

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 24446502a8dacfcfe50092f58143777d47f2cf52..039daea666e94ddd3fbb53ab163ef3df94f287ab 100644
--- a/cc/trees/single_thread_proxy.h
+++ b/cc/trees/single_thread_proxy.h
@@ -17,6 +17,7 @@
 
 namespace cc {
 
+class BeginFrameManager;
 class ContextProvider;
 class LayerTreeHost;
 class LayerTreeHostSingleThreadClient;
@@ -28,7 +29,8 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
   static scoped_ptr<Proxy> 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);
   virtual ~SingleThreadProxy();
 
   // Proxy implementation
@@ -117,7 +119,8 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
   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);
 
   void BeginMainFrame();
   void DoCommit(base::TimeTicks frame_begin_time);
@@ -149,6 +152,9 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
   bool commit_was_deferred_;
   bool commit_requested_;
 
+  // Not owned.
+  BeginFrameManager* begin_frame_manager_;
+
   base::WeakPtrFactory<SingleThreadProxy> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SingleThreadProxy);