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

Unified Diff: chrome/browser/sync/test/integration/two_client_autofill_sync_test.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
Index: chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
index fe2373c11fedfefafa0d4f66ce39859b5a3db2ac..ab876a22ff3182738ec5b06ebbb15db4354c057b 100644
--- a/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
@@ -108,8 +108,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, AddUnicodeProfile) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
std::set<AutofillKey> keys;
- keys.insert(AutofillKey(WideToUTF16(L"Sigur R\u00F3s"),
- WideToUTF16(L"\u00C1g\u00E6tis byrjun")));
+ keys.insert(AutofillKey(base::WideToUTF16(L"Sigur R\u00F3s"),
+ base::WideToUTF16(L"\u00C1g\u00E6tis byrjun")));
AddKeys(0, keys);
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AwaitQuiescence());
@@ -188,7 +188,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest,
UpdateProfile(0,
GetAllProfiles(0)[0]->guid(),
AutofillType(autofill::NAME_FIRST),
- ASCIIToUTF16("Bart"));
+ base::ASCIIToUTF16("Bart"));
MakeABookmarkChange(0);
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
ASSERT_TRUE(ProfilesMatch(0, 1));
@@ -221,7 +221,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, SameProfileWithConflict) {
AutofillProfile profile0 = CreateAutofillProfile(PROFILE_HOMER);
AutofillProfile profile1 = CreateAutofillProfile(PROFILE_HOMER);
profile1.SetRawInfo(autofill::PHONE_HOME_WHOLE_NUMBER,
- ASCIIToUTF16("1234567890"));
+ base::ASCIIToUTF16("1234567890"));
AddProfile(0, profile0);
AddProfile(1, profile1);
@@ -308,11 +308,11 @@ IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, UpdateFields) {
UpdateProfile(0,
GetAllProfiles(0)[0]->guid(),
AutofillType(autofill::NAME_FIRST),
- ASCIIToUTF16("Lisa"));
+ base::ASCIIToUTF16("Lisa"));
UpdateProfile(0,
GetAllProfiles(0)[0]->guid(),
AutofillType(autofill::EMAIL_ADDRESS),
- ASCIIToUTF16("grrrl@TV.com"));
+ base::ASCIIToUTF16("grrrl@TV.com"));
MakeABookmarkChange(0);
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
ASSERT_TRUE(ProfilesMatch(0, 1));
@@ -332,12 +332,12 @@ IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, DISABLED_ConflictingFields) {
UpdateProfile(0,
GetAllProfiles(0)[0]->guid(),
AutofillType(autofill::NAME_FIRST),
- ASCIIToUTF16("Lisa"));
+ base::ASCIIToUTF16("Lisa"));
MakeABookmarkChange(0);
UpdateProfile(1,
GetAllProfiles(1)[0]->guid(),
AutofillType(autofill::NAME_FIRST),
- ASCIIToUTF16("Bart"));
+ base::ASCIIToUTF16("Bart"));
MakeABookmarkChange(1);
ASSERT_TRUE(AwaitQuiescence());
ASSERT_TRUE(ProfilesMatch(0, 1));
@@ -467,7 +467,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, NoCreditCardSync) {
CreditCard card;
card.SetRawInfo(autofill::CREDIT_CARD_NUMBER,
- ASCIIToUTF16("6011111111111117"));
+ base::ASCIIToUTF16("6011111111111117"));
std::vector<CreditCard> credit_cards;
credit_cards.push_back(card);
SetCreditCards(0, &credit_cards);

Powered by Google App Engine
This is Rietveld 408576698