Index: ui/gfx/text_elider_unittest.cc |
diff --git a/ui/gfx/text_elider_unittest.cc b/ui/gfx/text_elider_unittest.cc |
index 5eeea5c401f84ee09f89b9b55139a5f5f3b62d52..b0baa4226da611604a608d00ee9a3d7785e876f2 100644 |
--- a/ui/gfx/text_elider_unittest.cc |
+++ b/ui/gfx/text_elider_unittest.cc |
@@ -668,7 +668,8 @@ TEST(TextEliderTest, MAYBE_ElideRectangleText) { |
TRUNCATE_LONG_WORDS, |
&lines)); |
if (cases[i].output) { |
- const std::string result = UTF16ToUTF8(JoinString(lines, '|')); |
+ const std::string result = |
+ UTF16ToUTF8(base::JoinString(lines, ASCIIToUTF16("|"))); |
EXPECT_EQ(cases[i].output, result) << "Case " << i << " failed!"; |
} else { |
EXPECT_TRUE(lines.empty()) << "Case " << i << " failed!"; |
@@ -715,7 +716,8 @@ TEST(TextEliderTest, MAYBE_ElideRectangleTextPunctuation) { |
wrap_behavior, |
&lines)); |
if (cases[i].output) { |
- const std::string result = UTF16ToUTF8(JoinString(lines, '|')); |
+ const std::string result = |
+ UTF16ToUTF8(base::JoinString(lines, base::ASCIIToUTF16("|"))); |
EXPECT_EQ(cases[i].output, result) << "Case " << i << " failed!"; |
} else { |
EXPECT_TRUE(lines.empty()) << "Case " << i << " failed!"; |
@@ -784,7 +786,8 @@ TEST(TextEliderTest, MAYBE_ElideRectangleTextLongWords) { |
&lines)); |
std::string expected_output(cases[i].output); |
base::ReplaceSubstringsAfterOffset(&expected_output, 0, "...", kEllipsis); |
- const std::string result = UTF16ToUTF8(JoinString(lines, '|')); |
+ const std::string result = |
+ UTF16ToUTF8(base::JoinString(lines, base::ASCIIToUTF16("|"))); |
EXPECT_EQ(expected_output, result) << "Case " << i << " failed!"; |
} |
} |