Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(612)

Unified Diff: ui/gfx/text_elider_unittest.cc

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/font_render_params_linux.cc ('k') | ui/gl/gl_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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!";
}
}
« no previous file with comments | « ui/gfx/font_render_params_linux.cc ('k') | ui/gl/gl_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698