Fork cc::OutputSurface into cc::CompositorFrameSink.

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 6f174fa1ba9c6f5a34a119bcb4332c1dce0fc10a..846b67b36c37ad6d208377504fc33b1c0dd29c00 100644
--- a/cc/scheduler/scheduler_settings.cc
+++ b/cc/scheduler/scheduler_settings.cc
@@ -8,17 +8,7 @@
 
 namespace cc {
 
-SchedulerSettings::SchedulerSettings()
-    : use_external_begin_frame_source(false),
-      main_frame_while_swap_throttled_enabled(false),
-      main_frame_before_activation_enabled(false),
-      commit_to_active_tree(false),
-      timeout_and_draw_when_animation_checkerboards(true),
-      using_synchronous_renderer_compositor(false),
-      throttle_frame_production(true),
-      abort_commit_before_output_surface_creation(true),
-      maximum_number_of_failed_draws_before_draw_is_forced(3),
-      background_frame_interval(base::TimeDelta::FromSeconds(1)) {}
+SchedulerSettings::SchedulerSettings() = default;
 
 SchedulerSettings::SchedulerSettings(const SchedulerSettings& other) = default;
 
@@ -44,8 +34,8 @@ SchedulerSettings::AsValue() const {
   state->SetBoolean("throttle_frame_production", throttle_frame_production);
   state->SetInteger("background_frame_interval",
                     background_frame_interval.InMicroseconds());
-  state->SetBoolean("abort_commit_before_output_surface_creation",
-                    abort_commit_before_output_surface_creation);
+  state->SetBoolean("abort_commit_before_compositor_frame_sink_creation",
+                    abort_commit_before_compositor_frame_sink_creation);
   return std::move(state);
 }