chrome/browser/ui/bookmarks/bookmark_browsertest.cc - Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/bookmarks/bookmark_browsertest.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/blocked_content/popup_blocker_browsertest.cc ('k') | chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/bookmarks/bookmark_browsertest.cc

diff --git a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc

index 040be546244bb0618d6281453b1b911f733da131..e54c2c7a4bc76f0c2ab279c117c85b7d373be946 100644

--- a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc

+++ b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc

@@ -82,7 +82,7 @@ IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, PRE_Persist) {

bookmark_utils::AddIfNotBookmarked(

bookmark_model, GURL(kPersistBookmarkURL),

- ASCIIToUTF16(kPersistBookmarkTitle));

+ base::ASCIIToUTF16(kPersistBookmarkTitle));

}

IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, Persist) {

@@ -93,7 +93,7 @@ IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, Persist) {

ASSERT_EQ(1u, urls.size());

ASSERT_EQ(GURL(kPersistBookmarkURL), urls[0].url);

- ASSERT_EQ(ASCIIToUTF16(kPersistBookmarkTitle), urls[0].title);

+ ASSERT_EQ(base::ASCIIToUTF16(kPersistBookmarkTitle), urls[0].title);

}

#if !defined(OS_CHROMEOS) // No multi-profile on ChromeOS.

@@ -115,7 +115,7 @@ IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, DISABLED_MultiProfile) {

bookmark_utils::AddIfNotBookmarked(

bookmark_model1, GURL(kPersistBookmarkURL),

- ASCIIToUTF16(kPersistBookmarkTitle));

+ base::ASCIIToUTF16(kPersistBookmarkTitle));

std::vector<BookmarkService::URLAndTitle> urls1, urls2;

bookmark_model1->GetBookmarks(&urls1);

bookmark_model2->GetBookmarks(&urls2);