Update from https://crrev.com/314320

cc/trees/layer_tree_settings.h

Index: cc/trees/layer_tree_settings.h
diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
index f1bde3272295d62afc259994115c3806a987abb9..597a27979b26159b0ce87a3b9f794a172b8b4f03 100644
--- a/cc/trees/layer_tree_settings.h
+++ b/cc/trees/layer_tree_settings.h
@@ -35,6 +35,7 @@ class CC_EXPORT LayerTreeSettings {
   bool use_distance_field_text;
   bool gpu_rasterization_enabled;
   bool gpu_rasterization_forced;
+  int gpu_rasterization_msaa_sample_count;
   bool create_low_res_tiling;
 
   enum ScrollbarAnimator {
@@ -46,6 +47,7 @@ class CC_EXPORT LayerTreeSettings {
   int scrollbar_fade_delay_ms;
   int scrollbar_fade_resize_delay_ms;
   int scrollbar_fade_duration_ms;
+  float scrollbar_show_scale_threshold;
   SkColor solid_color_scrollbar_color;
   bool calculate_top_controls_position;
   bool timeout_and_draw_when_animation_checkerboards;