Aura Overlay Scrollbars appear when mouse hovers over scroller edge

cc/trees/layer_tree_host_impl_unittest.cc

Index: cc/trees/layer_tree_host_impl_unittest.cc
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index a82de31691a1547c794c37727430cdb39160baa1..9363993b1b235d12e33e6e6a4e73e4fe502fc9df 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -2735,8 +2735,10 @@ class LayerTreeHostImplTestScrollbarAnimation : public LayerTreeHostImplTest {
   void RunTest(LayerTreeSettings::ScrollbarAnimator animator) {
     LayerTreeSettings settings = DefaultSettings();
     settings.scrollbar_animator = animator;
-    settings.scrollbar_fade_delay = base::TimeDelta::FromMilliseconds(20);
-    settings.scrollbar_fade_duration = base::TimeDelta::FromMilliseconds(20);
+    settings.scrollbar_fade_in_delay = base::TimeDelta::FromMilliseconds(20);
+    settings.scrollbar_fade_out_delay = base::TimeDelta::FromMilliseconds(20);
+    settings.scrollbar_fade_out_duration =
+        base::TimeDelta::FromMilliseconds(20);
 
     // If no animator is set, scrollbar won't show and no animation is expected.
     bool expecting_animations = animator != LayerTreeSettings::NO_ANIMATOR;
@@ -2926,8 +2928,10 @@ class LayerTreeHostImplTestScrollbarOpacity : public LayerTreeHostImplTest {
   void RunTest(LayerTreeSettings::ScrollbarAnimator animator) {
     LayerTreeSettings settings = DefaultSettings();
     settings.scrollbar_animator = animator;
-    settings.scrollbar_fade_delay = base::TimeDelta::FromMilliseconds(20);
-    settings.scrollbar_fade_duration = base::TimeDelta::FromMilliseconds(20);
+    settings.scrollbar_fade_in_delay = base::TimeDelta::FromMilliseconds(20);
+    settings.scrollbar_fade_out_delay = base::TimeDelta::FromMilliseconds(20);
+    settings.scrollbar_fade_out_duration =
+        base::TimeDelta::FromMilliseconds(20);
     gfx::Size content_size(100, 100);
 
     // If no animator is set, scrollbar won't show and no animation is expected.
@@ -3057,8 +3061,9 @@ TEST_F(LayerTreeHostImplTest, ScrollbarInnerLargerThanOuter) {
 TEST_F(LayerTreeHostImplTest, ScrollbarRegistration) {
   LayerTreeSettings settings = DefaultSettings();
   settings.scrollbar_animator = LayerTreeSettings::ANDROID_OVERLAY;
-  settings.scrollbar_fade_delay = base::TimeDelta::FromMilliseconds(20);
-  settings.scrollbar_fade_duration = base::TimeDelta::FromMilliseconds(20);
+  settings.scrollbar_fade_in_delay = base::TimeDelta::FromMilliseconds(20);
+  settings.scrollbar_fade_out_delay = base::TimeDelta::FromMilliseconds(20);
+  settings.scrollbar_fade_out_duration = base::TimeDelta::FromMilliseconds(20);
   CreateHostImpl(settings, CreateCompositorFrameSink());
 
   gfx::Size viewport_size(300, 200);
@@ -3177,8 +3182,9 @@ TEST_F(LayerTreeHostImplTest, ScrollbarRegistration) {
 void LayerTreeHostImplTest::SetupMouseMoveAtWithDeviceScale(
     float device_scale_factor) {
   LayerTreeSettings settings = DefaultSettings();
-  settings.scrollbar_fade_delay = base::TimeDelta::FromMilliseconds(500);
-  settings.scrollbar_fade_duration = base::TimeDelta::FromMilliseconds(300);
+  settings.scrollbar_fade_in_delay = base::TimeDelta::FromMilliseconds(500);
+  settings.scrollbar_fade_out_delay = base::TimeDelta::FromMilliseconds(500);
+  settings.scrollbar_fade_out_duration = base::TimeDelta::FromMilliseconds(300);
   settings.scrollbar_animator = LayerTreeSettings::AURA_OVERLAY;
 
   gfx::Size viewport_size(300, 200);
@@ -11588,8 +11594,9 @@ TEST_F(LayerTreeHostImplTest, RecomputeGpuRasterOnCompositorFrameSinkChange) {
 void LayerTreeHostImplTest::SetupMouseMoveAtTestScrollbarStates(
     bool main_thread_scrolling) {
   LayerTreeSettings settings = DefaultSettings();
-  settings.scrollbar_fade_delay = base::TimeDelta::FromMilliseconds(500);
-  settings.scrollbar_fade_duration = base::TimeDelta::FromMilliseconds(300);
+  settings.scrollbar_fade_in_delay = base::TimeDelta::FromMilliseconds(500);
+  settings.scrollbar_fade_out_delay = base::TimeDelta::FromMilliseconds(500);
+  settings.scrollbar_fade_out_duration = base::TimeDelta::FromMilliseconds(300);
   settings.scrollbar_animator = LayerTreeSettings::AURA_OVERLAY;
 
   gfx::Size viewport_size(300, 200);