chrome/browser/search_engines/template_url_service_util_unittest.cc - Issue 120983002: 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/search_engines/template_url_service_util_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

« no previous file with comments | « chrome/browser/search_engines/template_url_service_unittest.cc ('k') | chrome/browser/search_engines/template_url_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/template_url_service_util_unittest.cc

diff --git a/chrome/browser/search_engines/template_url_service_util_unittest.cc b/chrome/browser/search_engines/template_url_service_util_unittest.cc

index 163b6de87af24f37662b22c99965c7a8ad286af4..6f53721e5b77912422a168ef5a6400884d4fb0f9 100644

--- a/chrome/browser/search_engines/template_url_service_util_unittest.cc

+++ b/chrome/browser/search_engines/template_url_service_util_unittest.cc

@@ -20,7 +20,7 @@ TemplateURL* CreatePrepopulateTemplateURL(int prepopulate_id,

TemplateURLID id) {

TemplateURLData data;

data.prepopulate_id = prepopulate_id;

- data.SetKeyword(ASCIIToUTF16(keyword));

+ data.SetKeyword(base::ASCIIToUTF16(keyword));

data.id = id;

return new TemplateURL(NULL, data);

}

@@ -73,6 +73,8 @@ TEST(TemplateURLServiceUtilTest, RemoveDuplicatePrepopulateIDs) {

EXPECT_EQ(local_turls.size(),

prepopulated_turls.size() + num_non_prepopulated_urls);

for (TemplateURLService::TemplateURLVector::const_iterator itr =

- local_turls.begin(); itr != local_turls.end(); ++itr)

- EXPECT_TRUE(StartsWith((*itr)->keyword(), ASCIIToUTF16("winner"), true));

+ local_turls.begin(); itr != local_turls.end(); ++itr) {

+ EXPECT_TRUE(

+ StartsWith((*itr)->keyword(), base::ASCIIToUTF16("winner"), true));

+ }

}