| Index: cc/layers/layer_impl_unittest.cc
|
| diff --git a/cc/layers/layer_impl_unittest.cc b/cc/layers/layer_impl_unittest.cc
|
| index d9cfd9251744d5dfc950b10f02969d60a18487c1..1d8289f04a55273cdd8e5bb305f7bafb14a6ded6 100644
|
| --- a/cc/layers/layer_impl_unittest.cc
|
| +++ b/cc/layers/layer_impl_unittest.cc
|
| @@ -682,7 +682,7 @@ TEST_F(LayerImplScrollTest, SetNewScrollbarParameters) {
|
| vertical_scrollbar->SetScrollLayerAndClipLayerByIds(
|
| layer()->id(), tree()->root_layer()->id());
|
|
|
| - float expected_vertical_maximum =
|
| + int expected_vertical_maximum =
|
| layer()->bounds().height() - tree()->root_layer()->bounds().height();
|
| EXPECT_EQ(expected_vertical_maximum, vertical_scrollbar->maximum());
|
| EXPECT_EQ(scroll_offset.y(), vertical_scrollbar->current_pos());
|
| @@ -692,7 +692,7 @@ TEST_F(LayerImplScrollTest, SetNewScrollbarParameters) {
|
| horizontal_scrollbar->SetScrollLayerAndClipLayerByIds(
|
| layer()->id(), tree()->root_layer()->id());
|
|
|
| - float expected_horizontal_maximum =
|
| + int expected_horizontal_maximum =
|
| layer()->bounds().width() - tree()->root_layer()->bounds().width();
|
| EXPECT_EQ(expected_horizontal_maximum, horizontal_scrollbar->maximum());
|
| EXPECT_EQ(scroll_offset.x(), horizontal_scrollbar->current_pos());
|
|
|