| 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 03875389dea1935008cfba6ecfd5376b1ff5913e..44ed0c050084494607c0bbb75ae56dfdc0c93e81 100644
|
| --- a/cc/trees/layer_tree_host_impl_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_impl_unittest.cc
|
| @@ -81,7 +81,7 @@ class LayerTreeHostImplTest : public testing::Test,
|
| LayerTreeSettings settings;
|
| settings.minimum_occlusion_tracking_size = gfx::Size();
|
| settings.impl_side_painting = true;
|
| - settings.solid_color_scrollbars = true;
|
| + settings.force_solid_color_scrollbars = true;
|
|
|
| host_impl_ = LayerTreeHostImpl::Create(settings,
|
| this,
|
| @@ -696,7 +696,8 @@ TEST_F(LayerTreeHostImplTest, ScrollVerticallyByPageReturnsCorrectValue) {
|
| cc::ScrollbarLayerImpl::Create(
|
| host_impl_->active_tree(),
|
| 20,
|
| - VERTICAL));
|
| + VERTICAL,
|
| + false));
|
| vertical_scrollbar->SetBounds(gfx::Size(15, 1000));
|
| host_impl_->RootScrollLayer()->SetVerticalScrollbarLayer(
|
| vertical_scrollbar.get());
|
| @@ -1059,7 +1060,8 @@ TEST_F(LayerTreeHostImplTest, ScrollbarLinearFadeScheduling) {
|
| scoped_ptr<ScrollbarLayerImpl> scrollbar = ScrollbarLayerImpl::Create(
|
| host_impl_->active_tree(),
|
| 4,
|
| - VERTICAL);
|
| + VERTICAL,
|
| + false);
|
| scroll->SetVerticalScrollbarLayer(scrollbar.get());
|
|
|
| scroll->AddChild(contents.Pass());
|
|
|