Unified BeginFrame scheduling

cc/scheduler/scheduler_settings.cc

Index: cc/scheduler/scheduler_settings.cc
diff --git a/cc/scheduler/scheduler_settings.cc b/cc/scheduler/scheduler_settings.cc
index ea714e34b0dbae4fd3fc49fc0c874f758e739add..6eefefd707733bfed38a6744f39bc0ebfadd9f36 100644
--- a/cc/scheduler/scheduler_settings.cc
+++ b/cc/scheduler/scheduler_settings.cc
@@ -10,7 +10,9 @@
 namespace cc {
 
 SchedulerSettings::SchedulerSettings()
-    : begin_frame_scheduling_enabled(true),
+    : begin_frame_receiver(true),
+      begin_frame_publisher(false),
+      using_platform_vsync(false),
       main_frame_before_draw_enabled(true),
       main_frame_before_activation_enabled(false),
       impl_side_painting(false),
@@ -21,7 +23,9 @@ SchedulerSettings::SchedulerSettings()
 }
 
 SchedulerSettings::SchedulerSettings(const LayerTreeSettings& settings)
-    : begin_frame_scheduling_enabled(settings.begin_frame_scheduling_enabled),
+    : begin_frame_receiver(settings.begin_frame_receiver),
+      begin_frame_publisher(settings.begin_frame_publisher),
+      using_platform_vsync(settings.using_platform_vsync),
       main_frame_before_draw_enabled(settings.main_frame_before_draw_enabled),
       main_frame_before_activation_enabled(
           settings.main_frame_before_activation_enabled),
@@ -33,6 +37,8 @@ SchedulerSettings::SchedulerSettings(const LayerTreeSettings& settings)
       using_synchronous_renderer_compositor(
           settings.using_synchronous_renderer_compositor),
       throttle_frame_production(settings.throttle_frame_production) {
+  if (begin_frame_receiver)
+    DCHECK(!begin_frame_publisher);
 }
 
 SchedulerSettings::~SchedulerSettings() {}
@@ -41,8 +47,12 @@ scoped_refptr<base::debug::ConvertableToTraceFormat>
 SchedulerSettings::AsValue() const {
   scoped_refptr<base::debug::TracedValue> state =
       new base::debug::TracedValue();
-  state->SetBoolean("begin_frame_scheduling_enabled",
-                    begin_frame_scheduling_enabled);
+  state->SetBoolean("begin_frame_receiver",
+                    begin_frame_receiver);
+  state->SetBoolean("begin_frame_publisher",
+                    begin_frame_publisher);
+  state->SetBoolean("using_platform_vsync",
+                    using_platform_vsync);
   state->SetBoolean("main_frame_before_draw_enabled",
                     main_frame_before_draw_enabled);
   state->SetBoolean("main_frame_before_activation_enabled",