chrome/browser/search_engines/template_url_service_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_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_sync_unittest.cc ('k') | chrome/browser/search_engines/template_url_service_util_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_unittest.cc

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

index a65a19ee94dd52d6ace023bf3e3c97cdae91565a..5338d9762f1098e1ad8807e396e5b828a93f6cb2 100644

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

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

@@ -34,6 +34,7 @@

#include "extensions/common/manifest_constants.h"

#include "testing/gtest/include/gtest/gtest.h"

+using base::ASCIIToUTF16;

using base::Time;

using base::TimeDelta;

using content::BrowserThread;

@@ -100,8 +101,8 @@ TemplateURL* CreateKeywordWithDate(

Time date_created,

Time last_modified) {

TemplateURLData data;

- data.short_name = UTF8ToUTF16(short_name);

- data.SetKeyword(UTF8ToUTF16(keyword));

+ data.short_name = base::UTF8ToUTF16(short_name);

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

data.SetURL(url);

data.suggestions_url = suggest_url;

if (!alternate_url.empty())