| Index: cc/layers/scrollbar_layer_unittest.cc
|
| diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
|
| index ce209fdbd8d59f0475dc3abac23942280a873b06..fa46690d8218948d65783a05169128f554d2ac32 100644
|
| --- a/cc/layers/scrollbar_layer_unittest.cc
|
| +++ b/cc/layers/scrollbar_layer_unittest.cc
|
| @@ -105,9 +105,11 @@ class ScrollbarLayerTest : public testing::Test {
|
| layer_tree_settings_.use_zero_copy = true;
|
| layer_tree_settings_.scrollbar_animator =
|
| LayerTreeSettings::ANDROID_OVERLAY;
|
| - layer_tree_settings_.scrollbar_fade_delay =
|
| + layer_tree_settings_.scrollbar_fade_in_delay =
|
| base::TimeDelta::FromMilliseconds(20);
|
| - layer_tree_settings_.scrollbar_fade_duration =
|
| + layer_tree_settings_.scrollbar_fade_out_delay =
|
| + base::TimeDelta::FromMilliseconds(20);
|
| + layer_tree_settings_.scrollbar_fade_out_duration =
|
| base::TimeDelta::FromMilliseconds(20);
|
| layer_tree_settings_.verify_clip_tree_calculations = true;
|
|
|
|
|