Index: chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc |
diff --git a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc |
index 34b496c7494b2f6f6a101f53afb7834d4ab08bb5..c05eafd5c2f9ebd21f3654b76591105b349b18e1 100644 |
--- a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc |
+++ b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc |
@@ -78,7 +78,7 @@ class ProfileListChromeOSTest : public testing::Test { |
} |
void AddProfile(base::string16 name, bool log_in) { |
- std::string email_string = UTF16ToASCII(name) + "@example.com"; |
+ std::string email_string = base::UTF16ToASCII(name) + "@example.com"; |
// Add a user to the fake user manager. |
GetFakeUserManager()->AddUser(email_string); |
@@ -181,7 +181,7 @@ TEST_F(ProfileListChromeOSTest, DontShowManagedUsers) { |
cache->GetUserDataDir().AppendASCII("p2"), managed_name, |
base::string16(), 0, "TEST_ID"); |
- GetFakeUserManager()->AddUser(UTF16ToASCII(managed_name)); |
+ GetFakeUserManager()->AddUser(base::UTF16ToASCII(managed_name)); |
AvatarMenu* menu = GetAvatarMenu(); |
ASSERT_EQ(1U, menu->GetNumberOfItems()); |
@@ -225,7 +225,7 @@ TEST_F(ProfileListChromeOSTest, ActiveItem) { |
AddProfile(name2, true); |
// Initialize ProfileHelper, it will be accessed from GetActiveProfileIndex. |
- std::string email_string = UTF16ToASCII(name1) + "@example.com"; |
+ std::string email_string = base::UTF16ToASCII(name1) + "@example.com"; |
std::string hash = email_string + kUserIdHashSuffix; |
ActiveUserChanged( |
g_browser_process->platform_part()->profile_helper(), hash); |
@@ -261,7 +261,7 @@ TEST_F(ProfileListChromeOSTest, ModifyingNameResortsCorrectly) { |
// Change name of the first profile, to trigger resorting of the profiles: |
// now the first menu item should be named "beta", and the second be "gamma". |
GetFakeUserManager()->SaveUserDisplayName( |
- UTF16ToASCII(name1) + "@example.com", newname1); |
+ base::UTF16ToASCII(name1) + "@example.com", newname1); |
manager()->profile_info_cache()->SetNameOfProfileAtIndex(0, newname1); |
const AvatarMenu::Item& item1next = menu->GetItemAt(0); |