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 35dee073e582be9588a5239626f42e09bda6ec8b..b1d24a1776661c22e09867118ff7464ad076a2b3 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -173,8 +173,13 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
 
   settings.throttle_frame_production =
       !cmd->HasSwitch(switches::kDisableGpuVsync);
-  settings.begin_frame_scheduling_enabled =
-      cmd->HasSwitch(switches::kEnableBeginFrameScheduling);
+#if defined(OS_ANDROID) || (defined(USE_AURA) && !defined(OS_CHROMEOS))
+  settings.begin_frame_receiver = true;
+#elif defined(OS_MACOSX)
+  // Mac only uses browser compositor when delegated renderer is used.
+  if (cmd->HasSwitch(switches::kEnableDelegatedRenderer))
+    settings.begin_frame_receiver = true;
+#endif
   settings.main_frame_before_activation_enabled =
       cmd->HasSwitch(cc::switches::kEnableMainFrameBeforeActivation) &&
       !cmd->HasSwitch(cc::switches::kDisableMainFrameBeforeActivation);