Making OutputSurface a begin frame source and vsync source.

cc/trees/thread_proxy.cc

Index: cc/trees/thread_proxy.cc
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
index ba07601836554435bc82c662474479625225fa5c..882b75c88f13547e1710d45a0bae2263000ea5a2 100644
--- a/cc/trees/thread_proxy.cc
+++ b/cc/trees/thread_proxy.cc
@@ -329,11 +329,6 @@ void ThreadProxy::DidLoseOutputSurfaceOnImplThread() {
   impl().scheduler->DidLoseOutputSurface();
 }
 
-void ThreadProxy::CommitVSyncParameters(base::TimeTicks timebase,
-                                        base::TimeDelta interval) {
-  impl().scheduler->CommitVSyncParameters(timebase, interval);
-}
-
 void ThreadProxy::SetEstimatedParentDrawTime(base::TimeDelta draw_time) {
   impl().scheduler->SetEstimatedParentDrawTime(draw_time);
 }
@@ -355,10 +350,6 @@ void ThreadProxy::DidSwapBuffersCompleteOnImplThread() {
       base::Bind(&ThreadProxy::DidCompleteSwapBuffers, main_thread_weak_ptr_));
 }
 
-BeginFrameSource* ThreadProxy::GetExternalBeginFrameSource() {
-  return impl().layer_tree_host_impl.get();
-}
-
 void ThreadProxy::WillBeginImplFrame(const BeginFrameArgs& args) {
   impl().layer_tree_host_impl->WillBeginImplFrame(args);
 }
@@ -1225,6 +1216,7 @@ void ThreadProxy::InitializeOutputSurfaceOnImplThread(
   DCHECK(IsImplThread());
 
   LayerTreeHostImpl* host_impl = impl().layer_tree_host_impl.get();
+  OutputSurface* output_surface_ptr = output_surface.get();
   bool success = host_impl->InitializeRenderer(output_surface.Pass());
   RendererCapabilities capabilities;
   if (success) {
@@ -1240,7 +1232,7 @@ void ThreadProxy::InitializeOutputSurfaceOnImplThread(
                  capabilities));
 
   if (success)
-    impl().scheduler->DidCreateAndInitializeOutputSurface();
+    impl().scheduler->DidCreateAndInitializeOutputSurface(output_surface_ptr);
 }
 
 void ThreadProxy::FinishGLOnImplThread(CompletionEvent* completion) {
@@ -1262,7 +1254,6 @@ void ThreadProxy::LayerTreeHostClosedOnImplThread(CompletionEvent* completion) {
   layer_tree_host()->DeleteContentsTexturesOnImplThread(
       impl().layer_tree_host_impl->resource_provider());
   impl().current_resource_update_controller.reset();
-  impl().layer_tree_host_impl->SetNeedsBeginFrames(false);
   impl().scheduler.reset();
   impl().layer_tree_host_impl.reset();
   impl().weak_factory.InvalidateWeakPtrs();