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

Unified Diff: chrome/browser/bookmarks/bookmark_model_unittest.cc

Issue 176843022: Move UTF16ToASCII, remove WideToASCII. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | « chrome/browser/background/background_contents_service.cc ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/bookmark_model_unittest.cc
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 59e34e312a2493dd52bbec002e9f5d445f500974..65139b3bfd8f23639c00e61a93580f788da8442a 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -859,7 +859,7 @@ void PopulateBookmarkNode(TestNode* parent,
PopulateBookmarkNode(child, model, new_bb_node);
} else {
model->AddURL(bb_node, i, child->GetTitle(),
- GURL("http://" + UTF16ToASCII(child->GetTitle())));
+ GURL("http://" + base::UTF16ToASCII(child->GetTitle())));
}
}
}
@@ -1022,10 +1022,10 @@ TEST_F(BookmarkModelTest, Reorder) {
// Make sure the order matches is correct (it should be reversed).
ASSERT_EQ(4, parent->child_count());
- EXPECT_EQ("D", UTF16ToASCII(parent->GetChild(0)->GetTitle()));
- EXPECT_EQ("C", UTF16ToASCII(parent->GetChild(1)->GetTitle()));
- EXPECT_EQ("B", UTF16ToASCII(parent->GetChild(2)->GetTitle()));
- EXPECT_EQ("A", UTF16ToASCII(parent->GetChild(3)->GetTitle()));
+ EXPECT_EQ("D", base::UTF16ToASCII(parent->GetChild(0)->GetTitle()));
+ EXPECT_EQ("C", base::UTF16ToASCII(parent->GetChild(1)->GetTitle()));
+ EXPECT_EQ("B", base::UTF16ToASCII(parent->GetChild(2)->GetTitle()));
+ EXPECT_EQ("A", base::UTF16ToASCII(parent->GetChild(3)->GetTitle()));
}
TEST_F(BookmarkModelTest, NodeVisibility) {
« no previous file with comments | « chrome/browser/background/background_contents_service.cc ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698