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

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

index 64d0835e8423535b2d076aac1d5bcc4a0b6af16e..9509ecf7803f9a70c80848e075df4d39dc226398 100644

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

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

@@ -28,6 +28,7 @@

#include "sync/protocol/sync.pb.h"

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

+using base::ASCIIToUTF16;

using base::Time;

namespace {

@@ -58,9 +59,9 @@ syncer::SyncData CreateCustomSyncData(const TemplateURL& turl,

sync_pb::EntitySpecifics specifics;

sync_pb::SearchEngineSpecifics* se_specifics =

specifics.mutable_search_engine();

- se_specifics->set_short_name(UTF16ToUTF8(turl.short_name()));

+ se_specifics->set_short_name(base::UTF16ToUTF8(turl.short_name()));

se_specifics->set_keyword(

- autogenerate_keyword ? std::string() : UTF16ToUTF8(turl.keyword()));

+ autogenerate_keyword ? std::string() : base::UTF16ToUTF8(turl.keyword()));

se_specifics->set_favicon_url(turl.favicon_url().spec());

se_specifics->set_url(url);

se_specifics->set_safe_for_autoreplace(turl.safe_for_autoreplace());

@@ -1261,12 +1262,12 @@ TEST_F(TemplateURLServiceSyncTest, TwoAutogeneratedKeywordsUsingGoogleBaseURL) {

syncer::SyncChange key1_change = processor()->change_for_guid("key1");

EXPECT_EQ(syncer::SyncChange::ACTION_UPDATE, key1_change.change_type());

EXPECT_EQ(keyword1->keyword(),

- UTF8ToUTF16(GetKeyword(key1_change.sync_data())));

+ base::UTF8ToUTF16(GetKeyword(key1_change.sync_data())));

ASSERT_TRUE(processor()->contains_guid("key2"));

syncer::SyncChange key2_change = processor()->change_for_guid("key2");

EXPECT_EQ(syncer::SyncChange::ACTION_UPDATE, key2_change.change_type());

EXPECT_EQ(keyword2->keyword(),

- UTF8ToUTF16(GetKeyword(key2_change.sync_data())));

+ base::UTF8ToUTF16(GetKeyword(key2_change.sync_data())));

}

TEST_F(TemplateURLServiceSyncTest, DuplicateEncodingsRemoved) {