| Index: ui/views/corewm/tooltip_controller_unittest.cc
|
| diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc
|
| index efe561d7a5bb235133bcaf6587ca6b1860c0053d..158066fa03a98e619e901bd481dac5cb66310335 100644
|
| --- a/ui/views/corewm/tooltip_controller_unittest.cc
|
| +++ b/ui/views/corewm/tooltip_controller_unittest.cc
|
| @@ -296,8 +296,8 @@ TEST_F(TooltipControllerTest, TrimTooltipToFitTests) {
|
| TooltipControllerTestHelper::TrimTooltipToFit(
|
| max_width, &tooltip, &width, &line_count);
|
| int expected_width = font.GetStringWidth(ASCIIToUTF16("Multi line"));
|
| - expected_width = std::max(expected_width,
|
| - font.GetStringWidth(ASCIIToUTF16("Tooltip")));
|
| + expected_width = std::max<int>(expected_width,
|
| + font.GetStringWidth(ASCIIToUTF16("Tooltip")));
|
| EXPECT_EQ(expected_width, width);
|
| EXPECT_EQ(2, line_count);
|
| EXPECT_EQ(ASCIIToUTF16("Multi line\nTooltip"), tooltip);
|
|
|