| Index: ash/shelf/shelf_layout_manager_unittest.cc
|
| diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
|
| index cc268fa76a2607250a86d0760431717db620696f..3e0024a986d745dc56db7f99ba8b56ad7ef105b6 100644
|
| --- a/ash/shelf/shelf_layout_manager_unittest.cc
|
| +++ b/ash/shelf/shelf_layout_manager_unittest.cc
|
| @@ -201,25 +201,25 @@ class ShelfDragCallback {
|
| // If dragging inwards from the visible state, then the shelf should
|
| // increase in size, but not more than the scroll delta.
|
| EXPECT_LE(visible_bounds_size, shelf_size);
|
| - EXPECT_LE(abs(shelf_size - visible_bounds_size),
|
| - abs(scroll_delta));
|
| + EXPECT_LE(std::abs(shelf_size - visible_bounds_size),
|
| + std::abs(scroll_delta));
|
| } else {
|
| if (shelf_size > not_visible_bounds_size) {
|
| // If dragging outwards from the visible state, then the shelf
|
| // should decrease in size, until it reaches the minimum size.
|
| - EXPECT_EQ(shelf_size, visible_bounds_size - abs(scroll_delta));
|
| + EXPECT_EQ(shelf_size, visible_bounds_size - std::abs(scroll_delta));
|
| }
|
| }
|
| } else {
|
| - if (fabs(scroll_delta) <
|
| + if (std::abs(scroll_delta) <
|
| visible_bounds_size - not_visible_bounds_size) {
|
| // Tests that the shelf sticks with the touch point during the drag
|
| // until the shelf is completely visible.
|
| - EXPECT_EQ(shelf_size, not_visible_bounds_size + abs(scroll_delta));
|
| + EXPECT_EQ(shelf_size, not_visible_bounds_size + std::abs(scroll_delta));
|
| } else {
|
| // Tests that after the shelf is completely visible, the shelf starts
|
| // resisting the drag.
|
| - EXPECT_LT(shelf_size, not_visible_bounds_size + abs(scroll_delta));
|
| + EXPECT_LT(shelf_size, not_visible_bounds_size + std::abs(scroll_delta));
|
| }
|
| }
|
| }
|
|
|