| Index: ui/gfx/text_elider_unittest.cc
|
| diff --git a/ui/gfx/text_elider_unittest.cc b/ui/gfx/text_elider_unittest.cc
|
| index 72630f220c7ddeb9d22cf655e3efed0e4e0e8498..6eb52ea78ea7667b297b0c7e89117bd9804fb326 100644
|
| --- a/ui/gfx/text_elider_unittest.cc
|
| +++ b/ui/gfx/text_elider_unittest.cc
|
| @@ -520,7 +520,8 @@ TEST(TextEliderTest, MAYBE_ElideRectangleText) {
|
| cases[i].available_pixel_width,
|
| cases[i].available_pixel_height,
|
| TRUNCATE_LONG_WORDS,
|
| - &lines));
|
| + &lines,
|
| + nullptr));
|
| if (cases[i].output) {
|
| const std::string result = UTF16ToUTF8(JoinString(lines, '|'));
|
| EXPECT_EQ(cases[i].output, result) << "Case " << i << " failed!";
|
| @@ -567,7 +568,8 @@ TEST(TextEliderTest, MAYBE_ElideRectangleTextPunctuation) {
|
| cases[i].available_pixel_width,
|
| cases[i].available_pixel_height,
|
| wrap_behavior,
|
| - &lines));
|
| + &lines,
|
| + nullptr));
|
| if (cases[i].output) {
|
| const std::string result = UTF16ToUTF8(JoinString(lines, '|'));
|
| EXPECT_EQ(cases[i].output, result) << "Case " << i << " failed!";
|
| @@ -635,7 +637,8 @@ TEST(TextEliderTest, MAYBE_ElideRectangleTextLongWords) {
|
| cases[i].available_pixel_width,
|
| kAvailableHeight,
|
| cases[i].wrap_behavior,
|
| - &lines));
|
| + &lines,
|
| + nullptr));
|
| std::string expected_output(cases[i].output);
|
| ReplaceSubstringsAfterOffset(&expected_output, 0, "...", kEllipsis);
|
| const std::string result = UTF16ToUTF8(JoinString(lines, '|'));
|
| @@ -665,12 +668,14 @@ TEST(TextEliderTest, MAYBE_ElideRectangleTextCheckLineWidth) {
|
| const int kAvailableHeight = 1000;
|
| const char text[] = "that Russian place we used to go to after fencing";
|
| std::vector<base::string16> lines;
|
| - EXPECT_EQ(0, ElideRectangleText(UTF8ToUTF16(text),
|
| - font_list,
|
| - kAvailableWidth,
|
| - kAvailableHeight,
|
| - WRAP_LONG_WORDS,
|
| - &lines));
|
| + EXPECT_EQ(0,
|
| + ElideRectangleText(UTF8ToUTF16(text),
|
| + font_list,
|
| + kAvailableWidth,
|
| + kAvailableHeight,
|
| + WRAP_LONG_WORDS,
|
| + &lines,
|
| + nullptr));
|
| ASSERT_EQ(2u, lines.size());
|
| EXPECT_LE(GetStringWidthF(lines[0], font_list), kAvailableWidth);
|
| EXPECT_LE(GetStringWidthF(lines[1], font_list), kAvailableWidth);
|
|
|