| Index: cc/layers/scrollbar_layer_unittest.cc
|
| diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
|
| index c1793b29c51c13842448f3208ffbaa9de53ca6da..3e6e56ec142c05b037cb68e055abd9c23b865ed8 100644
|
| --- a/cc/layers/scrollbar_layer_unittest.cc
|
| +++ b/cc/layers/scrollbar_layer_unittest.cc
|
| @@ -106,11 +106,9 @@ class ScrollbarLayerTest : public testing::Test {
|
| layer_tree_settings_.use_zero_copy = true;
|
| layer_tree_settings_.scrollbar_animator =
|
| LayerTreeSettings::ANDROID_OVERLAY;
|
| - layer_tree_settings_.scrollbar_show_delay =
|
| + layer_tree_settings_.scrollbar_fade_delay =
|
| base::TimeDelta::FromMilliseconds(20);
|
| - layer_tree_settings_.scrollbar_fade_out_delay =
|
| - base::TimeDelta::FromMilliseconds(20);
|
| - layer_tree_settings_.scrollbar_fade_out_duration =
|
| + layer_tree_settings_.scrollbar_fade_duration =
|
| base::TimeDelta::FromMilliseconds(20);
|
|
|
| scrollbar_layer_id_ = -1;
|
|
|