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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc

Issue 12314090: Add utf_string_conversions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
Index: chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
index 91de10863377b38e55c5b27c723bfa9c5df1fccd..92eb6209add97b6296224af00ffff9512ffa1d76 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
@@ -185,7 +185,7 @@ TEST_F(BookmarkEditorViewTest, EditURLKeepsPosition) {
BookmarkEditor::EditDetails::EditNode(GetNode("a")),
BookmarkEditorView::SHOW_TREE);
- SetURLText(UTF8ToWide(GURL(base_path() + "new_a").spec()));
+ SetURLText(base::UTF8ToWide(GURL(base_path() + "new_a").spec()));
ApplyEdits(editor_tree_model()->GetRoot()->GetChild(0));
@@ -219,7 +219,7 @@ TEST_F(BookmarkEditorViewTest, ChangeParentAndURL) {
BookmarkEditor::EditDetails::EditNode(GetNode("a")),
BookmarkEditorView::SHOW_TREE);
- SetURLText(UTF8ToWide(GURL(base_path() + "new_a").spec()));
+ SetURLText(base::UTF8ToWide(GURL(base_path() + "new_a").spec()));
ApplyEdits(editor_tree_model()->GetRoot()->GetChild(1));
@@ -274,7 +274,7 @@ TEST_F(BookmarkEditorViewTest, NewURL) {
bb_node, 1, GURL(), string16()),
BookmarkEditorView::SHOW_TREE);
- SetURLText(UTF8ToWide(GURL(base_path() + "a").spec()));
+ SetURLText(base::UTF8ToWide(GURL(base_path() + "a").spec()));
SetTitleText(L"new_a");
ApplyEdits(editor_tree_model()->GetRoot()->GetChild(0));
@@ -294,7 +294,7 @@ TEST_F(BookmarkEditorViewTest, ChangeURLNoTree) {
model_->other_node()->GetChild(0)),
BookmarkEditorView::NO_TREE);
- SetURLText(UTF8ToWide(GURL(base_path() + "a").spec()));
+ SetURLText(base::UTF8ToWide(GURL(base_path() + "a").spec()));
SetTitleText(L"new_a");
ApplyEdits(NULL);

Powered by Google App Engine
This is Rietveld 408576698