Aura Overlay Scrollbars appear when mouse hovers over scroller edge

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 f4f404ac55be9ec009675f3f0cf6c229ca061154..8695fe33ac1d8bc4b3cc59d1cefc78251aeb1bcd 100644
--- a/cc/trees/layer_tree_settings.cc
+++ b/cc/trees/layer_tree_settings.cc
@@ -38,9 +38,11 @@ bool LayerTreeSettings::operator==(const LayerTreeSettings& other) const {
              other.gpu_rasterization_msaa_sample_count &&
          create_low_res_tiling == other.create_low_res_tiling &&
          scrollbar_animator == other.scrollbar_animator &&
-         scrollbar_fade_delay == other.scrollbar_fade_delay &&
-         scrollbar_fade_resize_delay == other.scrollbar_fade_resize_delay &&
-         scrollbar_fade_duration == other.scrollbar_fade_duration &&
+         scrollbar_show_delay == other.scrollbar_show_delay &&
+         scrollbar_fade_out_delay == other.scrollbar_fade_out_delay &&
+         scrollbar_fade_out_resize_delay ==
+             other.scrollbar_fade_out_resize_delay &&
+         scrollbar_fade_out_duration == other.scrollbar_fade_out_duration &&
          solid_color_scrollbar_color == other.solid_color_scrollbar_color &&
          timeout_and_draw_when_animation_checkerboards ==
              other.timeout_and_draw_when_animation_checkerboards &&