Unified BeginFrame scheduling

content/renderer/gpu/render_widget_compositor.cc

Index: content/renderer/gpu/render_widget_compositor.cc
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index baf1ac13f675e9954fa11e1fbae7c52262119241..96f7a44a66621d15b5bc8e6edde4ea6093b61f49 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -169,8 +169,8 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
 
   settings.throttle_frame_production =
       !cmd->HasSwitch(switches::kDisableGpuVsync);
-  settings.begin_frame_scheduling_enabled =
-      cmd->HasSwitch(switches::kEnableBeginFrameScheduling);
+  settings.begin_frame_receiver =
+      cmd->HasSwitch(cc::switches::kEnableBeginFrameScheduling);
   settings.main_frame_before_activation_enabled =
       cmd->HasSwitch(cc::switches::kEnableMainFrameBeforeActivation) &&
       !cmd->HasSwitch(cc::switches::kDisableMainFrameBeforeActivation);
@@ -527,7 +527,8 @@ void RenderWidgetCompositor::Initialize(cc::LayerTreeSettings settings) {
         this,
         shared_bitmap_manager,
         settings,
-        base::MessageLoopProxy::current());
+        base::MessageLoopProxy::current(),
+        NULL /* Only used by browser-side scheduler */);
   }
   DCHECK(layer_tree_host_);
 }