Update some uses of UTF conversions in chrome/browser to use the base:: namespace.

chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/sync/test/integration/autofill_helper.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "components/autofill/core/browser/autofill_profile.h"
@@ skipping 90 matching lines @@
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(KeysMatch(0, 1));
   ASSERT_EQ(0U, GetAllKeys(0).size());
 }
 
 // TCM ID - 3678296.
 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());
   ASSERT_TRUE(KeysMatch(0, 1));
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest,
                        AddDuplicateNamesToSameProfile) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
@@ skipping 58 matching lines @@
   RemoveProfile(1, GetAllProfiles(1)[0]->guid());
   MakeABookmarkChange(1);
   ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
   ASSERT_TRUE(ProfilesMatch(0, 1));
   ASSERT_EQ(1U, GetAllProfiles(0).size());
 
   // Client0 updates a profile.
   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));
   ASSERT_EQ(1U, GetAllProfiles(0).size());
 
   // Client1 removes remaining profile.
   RemoveProfile(1, GetAllProfiles(1)[0]->guid());
   MakeABookmarkChange(1);
   ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
   ASSERT_TRUE(ProfilesMatch(0, 1));
@@ skipping 12 matching lines @@
   ASSERT_EQ(1U, GetAllProfiles(0).size());
 }
 
 // TCM ID - 3636294.
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, SameProfileWithConflict) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   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);
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(ProfilesMatch(0, 1));
   ASSERT_EQ(1U, GetAllProfiles(0).size());
 }
 
 // TCM ID - 3626291.
@@ skipping 66 matching lines @@
 
   AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));
   MakeABookmarkChange(0);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(ProfilesMatch(0, 1));
   ASSERT_EQ(1U, GetAllProfiles(0).size());
 
   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));
   ASSERT_EQ(1U, GetAllProfiles(0).size());
 }
 
 // TCM ID - 3628299.
 // This test is flaky on all platforms.  See crbug.com/152551.
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, DISABLED_ConflictingFields) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));
   MakeABookmarkChange(0);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(ProfilesMatch(0, 1));
   ASSERT_EQ(1U, GetAllProfiles(0).size());
   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));
   ASSERT_EQ(1U, GetAllProfiles(0).size());
 }
 
 // TCM ID - 3663293.
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, DisableAutofill) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
@@ skipping 109 matching lines @@
 }
 
 // Test credit cards don't sync.
 IN_PROC_BROWSER_TEST_F(TwoClientAutofillSyncTest, NoCreditCardSync) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AddProfile(0, CreateAutofillProfile(PROFILE_HOMER));
 
   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);
 
   MakeABookmarkChange(0);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(ProfilesMatch(0, 1));
   ASSERT_EQ(1U, GetAllProfiles(0).size());
 
   PersonalDataManager* pdm = GetPersonalDataManager(1);
   ASSERT_EQ(0U, pdm->GetCreditCards().size());
 }