Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/trees/layer_tree_settings.cc

Index: cc/trees/layer_tree_settings.cc
diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc
index 4f57316910df9c19ce1aa801aa9991d855f64317..9cffab3b15fb324e6a1faa5c128f5408ebc16139 100644
--- a/cc/trees/layer_tree_settings.cc
+++ b/cc/trees/layer_tree_settings.cc
@@ -102,8 +102,8 @@ SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const {
   scheduler_settings.throttle_frame_production = wait_for_beginframe_interval;
   scheduler_settings.background_frame_interval =
       base::TimeDelta::FromSecondsD(1.0 / background_animation_rate);
-  scheduler_settings.abort_commit_before_output_surface_creation =
-      abort_commit_before_output_surface_creation;
+  scheduler_settings.abort_commit_before_compositor_frame_sink_creation =
+      abort_commit_before_compositor_frame_sink_creation;
   return scheduler_settings;
 }