Move UTF16ToASCII, remove WideToASCII.

chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
@@ skipping 60 matching lines @@
     // Initialize the UserManager singleton to a fresh FakeUserManager instance.
     user_manager_enabler_.reset(
         new ScopedUserManagerEnabler(new FakeUserManager));
   }
 
   FakeUserManager* GetFakeUserManager() {
     return static_cast<FakeUserManager*>(UserManager::Get());
   }
 
   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);
     if (log_in) {
       GetFakeUserManager()->UserLoggedIn(
           email_string,
           email_string + kUserIdHashSuffix,
           false);
     }
 
@@ skipping 82 matching lines @@
   base::string16 managed_name(ASCIIToUTF16("p2@example.com"));
 
   AddProfile(name1, true);
 
   // Add a managed user profile.
   ProfileInfoCache* cache = manager()->profile_info_cache();
   manager()->profile_info_cache()->AddProfileToCache(
       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());
 
   const AvatarMenu::Item& item1 = menu->GetItemAt(0);
   EXPECT_EQ(0U, item1.menu_index);
   EXPECT_EQ(name1, item1.name);
 }
 
 TEST_F(ProfileListChromeOSTest, ShowAddProfileLink) {
@@ skipping 23 matching lines @@
 }
 
 TEST_F(ProfileListChromeOSTest, ActiveItem) {
   base::string16 name1(ASCIIToUTF16("p1.com"));
   base::string16 name2(ASCIIToUTF16("p2.com"));
 
   AddProfile(name1, true);
   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);
 
   AvatarMenu* menu = GetAvatarMenu();
 
   ASSERT_EQ(2U, menu->GetNumberOfItems());
   // TODO(jeremy): Expand test to verify active profile index other than 0
   // crbug.com/100871
   ASSERT_EQ(0U, menu->GetActiveProfileIndex());
@@ skipping 15 matching lines @@
   EXPECT_EQ(0U, item1.menu_index);
   EXPECT_EQ(name1, item1.name);
 
   const AvatarMenu::Item& item2 = menu->GetItemAt(1);
   EXPECT_EQ(1U, item2.menu_index);
   EXPECT_EQ(name2, item2.name);
 
   // 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);
   EXPECT_GT(change_count(), 1);
   EXPECT_EQ(0U, item1next.menu_index);
   EXPECT_EQ(name2, item1next.name);
 
   const AvatarMenu::Item& item2next = menu->GetItemAt(1);
   EXPECT_EQ(1U, item2next.menu_index);
   EXPECT_EQ(newname1, item2next.name);
@@ skipping 41 matching lines @@
 
   // Should only show avatar menu with multiple users.
   EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu());
 
   AddProfile(name2, false);
 
   EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu());
 }
 
 }  // namespace chromeos