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

Unified Diff: chrome/browser/ui/app_list/search/tokenized_string_unittest.cc

Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
Index: chrome/browser/ui/app_list/search/tokenized_string_unittest.cc
diff --git a/chrome/browser/ui/app_list/search/tokenized_string_unittest.cc b/chrome/browser/ui/app_list/search/tokenized_string_unittest.cc
index 480f8464c0d411ef866fc302a370d2850387c25f..d5706a144f147c57ee21c9a3eb3dcf44c8d512f8 100644
--- a/chrome/browser/ui/app_list/search/tokenized_string_unittest.cc
+++ b/chrome/browser/ui/app_list/search/tokenized_string_unittest.cc
@@ -21,7 +21,7 @@ base::string16 GetContent(const TokenizedString& tokenized) {
if (i > 0)
str += ' ';
str += tokens[i];
- str += UTF8ToUTF16(mappings[i].ToString());
+ str += base::UTF8ToUTF16(mappings[i].ToString());
}
return str;
}
@@ -36,51 +36,51 @@ TEST(TokenizedStringTest, Empty) {
TEST(TokenizedStringTest, Basic) {
{
- base::string16 text(UTF8ToUTF16("ScratchPad"));
+ base::string16 text(base::UTF8ToUTF16("ScratchPad"));
TokenizedString tokens(text);
- EXPECT_EQ(UTF8ToUTF16("scratch{0,7} pad{7,10}"),
+ EXPECT_EQ(base::UTF8ToUTF16("scratch{0,7} pad{7,10}"),
GetContent(tokens));
}
{
- base::string16 text(UTF8ToUTF16("Chess2.0"));
+ base::string16 text(base::UTF8ToUTF16("Chess2.0"));
TokenizedString tokens(text);
- EXPECT_EQ(UTF8ToUTF16("chess{0,5} 2.0{5,8}"),
+ EXPECT_EQ(base::UTF8ToUTF16("chess{0,5} 2.0{5,8}"),
GetContent(tokens));
}
{
- base::string16 text(UTF8ToUTF16("Cut the rope"));
+ base::string16 text(base::UTF8ToUTF16("Cut the rope"));
TokenizedString tokens(text);
- EXPECT_EQ(UTF8ToUTF16("cut{0,3} the{4,7} rope{8,12}"),
+ EXPECT_EQ(base::UTF8ToUTF16("cut{0,3} the{4,7} rope{8,12}"),
GetContent(tokens));
}
{
- base::string16 text(UTF8ToUTF16("AutoCAD WS"));
+ base::string16 text(base::UTF8ToUTF16("AutoCAD WS"));
TokenizedString tokens(text);
- EXPECT_EQ(UTF8ToUTF16("auto{0,4} cad{4,7} ws{8,10}"),
+ EXPECT_EQ(base::UTF8ToUTF16("auto{0,4} cad{4,7} ws{8,10}"),
GetContent(tokens));
}
{
- base::string16 text(UTF8ToUTF16("Great TweetDeck"));
+ base::string16 text(base::UTF8ToUTF16("Great TweetDeck"));
TokenizedString tokens(text);
- EXPECT_EQ(UTF8ToUTF16("great{0,5} tweet{6,11} deck{11,15}"),
+ EXPECT_EQ(base::UTF8ToUTF16("great{0,5} tweet{6,11} deck{11,15}"),
GetContent(tokens));
}
{
- base::string16 text(UTF8ToUTF16("Draw-It!"));
+ base::string16 text(base::UTF8ToUTF16("Draw-It!"));
TokenizedString tokens(text);
- EXPECT_EQ(UTF8ToUTF16("draw{0,4} it{5,7}"),
+ EXPECT_EQ(base::UTF8ToUTF16("draw{0,4} it{5,7}"),
GetContent(tokens));
}
{
- base::string16 text(UTF8ToUTF16("Faxing & Signing"));
+ base::string16 text(base::UTF8ToUTF16("Faxing & Signing"));
TokenizedString tokens(text);
- EXPECT_EQ(UTF8ToUTF16("faxing{0,6} signing{9,16}"),
+ EXPECT_EQ(base::UTF8ToUTF16("faxing{0,6} signing{9,16}"),
GetContent(tokens));
}
{
- base::string16 text(UTF8ToUTF16("!@#$%^&*()<<<**>>>"));
+ base::string16 text(base::UTF8ToUTF16("!@#$%^&*()<<<**>>>"));
TokenizedString tokens(text);
- EXPECT_EQ(UTF8ToUTF16(""),
+ EXPECT_EQ(base::UTF8ToUTF16(""),
GetContent(tokens));
}
}

Powered by Google App Engine
This is Rietveld 408576698