3 files changed, 11 insertions, 6 deletions
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc
index 69156ad..d47a9f6 100644
--- a/chrome/browser/autofill/autofill_browsertest.cc
+++ b/chrome/browser/autofill/autofill_browsertest.cc
@@ -49,6 +49,9 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
+using base::ASCIIToUTF16;
+using base::WideToUTF16;
+
 namespace autofill {
 
 class WindowedPersonalDataManagerObserver
diff --git a/chrome/browser/autofill/autofill_interactive_uitest.cc b/chrome/browser/autofill/autofill_interactive_uitest.cc
index 8591154..95a6217 100644
--- a/chrome/browser/autofill/autofill_interactive_uitest.cc
+++ b/chrome/browser/autofill/autofill_interactive_uitest.cc
@@ -53,6 +53,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
+using base::ASCIIToUTF16;
 
 namespace autofill {
 
@@ -1031,15 +1032,16 @@ IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest,
     base::string16 street = ASCIIToUTF16(
         base::IntToString(base::RandInt(0, 10000)) + " " +
         streets[base::RandInt(0, streets.size() - 1)]);
-    base::string16 city = ASCIIToUTF16(cities[base::RandInt(0, cities.size() - 1)]);
+    base::string16 city =
+        ASCIIToUTF16(cities[base::RandInt(0, cities.size() - 1)]);
     base::string16 zip(base::IntToString16(base::RandInt(0, 10000)));
     profile.SetRawInfo(NAME_FIRST, name);
     profile.SetRawInfo(EMAIL_ADDRESS, email);
     profile.SetRawInfo(ADDRESS_HOME_LINE1, street);
     profile.SetRawInfo(ADDRESS_HOME_CITY, city);
-    profile.SetRawInfo(ADDRESS_HOME_STATE, WideToUTF16(L"CA"));
+    profile.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
     profile.SetRawInfo(ADDRESS_HOME_ZIP, zip);
-    profile.SetRawInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"US"));
+    profile.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("US"));
     profiles.push_back(profile);
   }
   SetProfiles(&profiles);
diff --git a/chrome/browser/autofill/form_structure_browsertest.cc b/chrome/browser/autofill/form_structure_browsertest.cc
index 731b4ab..335ea98 100644
--- a/chrome/browser/autofill/form_structure_browsertest.cc
+++ b/chrome/browser/autofill/form_structure_browsertest.cc
@@ -91,9 +91,9 @@ std::string FormStructureBrowserTest::FormStructuresToString(
          field_iter != (*iter)->end();
          ++field_iter) {
       forms_string += (*field_iter)->Type().ToString();
-      forms_string += " | " + UTF16ToUTF8((*field_iter)->name);
-      forms_string += " | " + UTF16ToUTF8((*field_iter)->label);
-      forms_string += " | " + UTF16ToUTF8((*field_iter)->value);
+      forms_string += " | " + base::UTF16ToUTF8((*field_iter)->name);
+      forms_string += " | " + base::UTF16ToUTF8((*field_iter)->label);
+      forms_string += " | " + base::UTF16ToUTF8((*field_iter)->value);
       forms_string += "\n";
     }
   }