Unified BeginFrame scheduling

content/browser/compositor/gpu_process_transport_factory.cc

Index: content/browser/compositor/gpu_process_transport_factory.cc
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 17b05485e2100548e11665e3def068bad5f42db1..a2e6aefea67e6dde5a25d7a5460df9d352892fdf 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -186,8 +186,7 @@ scoped_ptr<cc::OutputSurface> GpuProcessTransportFactory::CreateOutputSurface(
               output_surface_proxy_,
               CreateSoftwareOutputDevice(compositor),
               per_compositor_data_[compositor]->surface_id,
-              &output_surface_map_,
-              compositor->vsync_manager()));
+              &output_surface_map_));
     }
     scoped_ptr<OnscreenDisplayClient> display_client(new OnscreenDisplayClient(
         context_provider, software_surface.Pass(), manager));
@@ -220,8 +219,7 @@ scoped_ptr<cc::OutputSurface> GpuProcessTransportFactory::CreateOutputSurface(
             output_surface_proxy_,
             CreateSoftwareOutputDevice(compositor),
             per_compositor_data_[compositor]->surface_id,
-            &output_surface_map_,
-            compositor->vsync_manager()));
+            &output_surface_map_));
     return surface.PassAs<cc::OutputSurface>();
   }
 
@@ -230,7 +228,6 @@ scoped_ptr<cc::OutputSurface> GpuProcessTransportFactory::CreateOutputSurface(
           context_provider,
           per_compositor_data_[compositor]->surface_id,
           &output_surface_map_,
-          compositor->vsync_manager(),
           CreateOverlayCandidateValidator(compositor->widget())));
   if (data->reflector.get())
     data->reflector->ReattachToOutputSurfaceFromMainThread(surface.get());