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

Unified Diff: chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc

Issue 112913004: 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
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
index b0535b7e083dd822bfa2ec27c0ebe6858ca425a5..2e7280b900624ec65d87f67abca12218039fb086 100644
--- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
+++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
@@ -84,7 +84,7 @@ BookmarkModel* RecentlyUsedFoldersComboModelTest::GetModel() {
// Verifies there are no duplicate nodes in the model.
TEST_F(RecentlyUsedFoldersComboModelTest, NoDups) {
const BookmarkNode* new_node = GetModel()->AddURL(
- GetModel()->bookmark_bar_node(), 0, ASCIIToUTF16("a"),
+ GetModel()->bookmark_bar_node(), 0, base::ASCIIToUTF16("a"),
GURL("http://a"));
RecentlyUsedFoldersComboModel model(GetModel(), new_node);
std::set<base::string16> items;
@@ -97,11 +97,11 @@ TEST_F(RecentlyUsedFoldersComboModelTest, NoDups) {
// Verifies that observers are notified on changes.
TEST_F(RecentlyUsedFoldersComboModelTest, NotifyObserver) {
const BookmarkNode* folder = GetModel()->AddFolder(
- GetModel()->bookmark_bar_node(), 0, ASCIIToUTF16("a"));
+ GetModel()->bookmark_bar_node(), 0, base::ASCIIToUTF16("a"));
const BookmarkNode* sub_folder = GetModel()->AddFolder(
- folder, 0, ASCIIToUTF16("b"));
+ folder, 0, base::ASCIIToUTF16("b"));
const BookmarkNode* new_node = GetModel()->AddURL(
- sub_folder, 0, ASCIIToUTF16("a"), GURL("http://a"));
+ sub_folder, 0, base::ASCIIToUTF16("a"), GURL("http://a"));
RecentlyUsedFoldersComboModel model(GetModel(), new_node);
TestComboboxModelObserver observer;
model.AddObserver(&observer);
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698