| Index: blimp/client/support/compositor/blimp_layer_tree_settings.cc | 
| diff --git a/blimp/client/support/compositor/blimp_layer_tree_settings.cc b/blimp/client/support/compositor/blimp_layer_tree_settings.cc | 
| index 8c44b6e852d0903c93ecf8693bcc42510089a84b..9f31e72d7c62718781eaededf365bd79efe2aeeb 100644 | 
| --- a/blimp/client/support/compositor/blimp_layer_tree_settings.cc | 
| +++ b/blimp/client/support/compositor/blimp_layer_tree_settings.cc | 
| @@ -61,9 +61,9 @@ void PopulateCommonLayerTreeSettings(cc::LayerTreeSettings* settings) { | 
| settings->gpu_rasterization_enabled = false; | 
| settings->using_synchronous_renderer_compositor = false; | 
| settings->scrollbar_animator = cc::LayerTreeSettings::LINEAR_FADE; | 
| -  settings->scrollbar_fade_delay_ms = 300; | 
| -  settings->scrollbar_fade_resize_delay_ms = 2000; | 
| -  settings->scrollbar_fade_duration_ms = 300; | 
| +  settings->scrollbar_fade_delay = base::TimeDelta::FromMilliseconds(300); | 
| +  settings->scrollbar_fade_resize_delay = base::TimeDelta::FromSeconds(2); | 
| +  settings->scrollbar_fade_duration = base::TimeDelta::FromMilliseconds(300); | 
| settings->solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); | 
| settings->renderer_settings.highp_threshold_min = 2048; | 
| settings->ignore_root_layer_flings = false; | 
| @@ -89,9 +89,10 @@ void PopulateCommonLayerTreeSettings(cc::LayerTreeSettings* settings) { | 
| #elif !defined(OS_MACOSX) | 
| settings->scrollbar_animator = cc::LayerTreeSettings::LINEAR_FADE; | 
| settings->solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); | 
| -  settings->scrollbar_fade_delay_ms = 500; | 
| -  settings->scrollbar_fade_resize_delay_ms = 500; | 
| -  settings->scrollbar_fade_duration_ms = 300; | 
| +  settings->scrollbar_fade_delay = base::TimeDelta::FromMilliseconds(500); | 
| +  settings->scrollbar_fade_resize_delay = | 
| +      base::TimeDelta::FromMilliseconds(500); | 
| +  settings->scrollbar_fade_duration = base::TimeDelta::FromMilliseconds(300); | 
|  | 
| // When pinching in, only show the pinch-viewport overlay scrollbars if the | 
| // page scale is at least some threshold away from the minimum. i.e. don't | 
|  |