This CL replaces user_manager::UserID with AccountId.

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 54 matching lines @@
         new ScopedUserManagerEnabler(new FakeChromeUserManager));
   }
 
   FakeChromeUserManager* GetFakeChromeUserManager() {
     return static_cast<FakeChromeUserManager*>(
         user_manager::UserManager::Get());
   }
 
   void AddProfile(base::string16 name, bool log_in) {
     std::string email_string = base::UTF16ToASCII(name) + "@example.com";
+    const AccountId account_id(AccountId::FromUserEmail(email_string));
 
     // Add a user to the fake user manager.
-    GetFakeChromeUserManager()->AddUser(email_string);
+    GetFakeChromeUserManager()->AddUser(account_id);
     if (log_in)
-      GetFakeChromeUserManager()->LoginUser(email_string);
+      GetFakeChromeUserManager()->LoginUser(account_id);
 
     // Create a profile for the user.
-    manager()->CreateTestingProfile(email_string);
+    manager()->CreateTestingProfile(account_id.GetUserEmail());
   }
 
   AvatarMenu* GetAvatarMenu() {
     // Reset the MockObserver.
     mock_observer_.reset(new MockObserver());
     EXPECT_EQ(0, change_count());
 
     // Reset the menu.
     avatar_menu_.reset(new AvatarMenu(
         manager()->profile_info_cache(),
         mock_observer_.get(),
         NULL));
     avatar_menu_->RebuildMenu();
     EXPECT_EQ(0, change_count());
     return avatar_menu_.get();
   }
 
   void ActiveUserChanged(const base::string16& name) {
     std::string email_string = base::UTF16ToASCII(name) + "@example.com";
-    GetFakeChromeUserManager()->SwitchActiveUser(email_string);
+    const AccountId account_id(AccountId::FromUserEmail(email_string));
+    GetFakeChromeUserManager()->SwitchActiveUser(account_id);
   }
 
   TestingProfileManager* manager() { return &manager_; }
 
   int change_count() const { return mock_observer_->change_count(); }
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfileManager manager_;
   scoped_ptr<MockObserver> mock_observer_;
@@ skipping 47 matching lines @@
   base::string16 supervised_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"), supervised_name, std::string(),
       base::string16(), 0, "TEST_ID");
 
-  GetFakeChromeUserManager()->AddUser(base::UTF16ToASCII(supervised_name));
+  GetFakeChromeUserManager()->AddUser(
+      AccountId::FromUserEmail(base::UTF16ToASCII(supervised_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 55 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".
   GetFakeChromeUserManager()->SaveUserDisplayName(
-      base::UTF16ToASCII(name1) + "@example.com", newname1);
+      AccountId::FromUserEmail(base::UTF16ToASCII(name1) + "@example.com"),
+      newname1);
   manager()->profile_info_cache()->SetNameOfProfileAtIndex(0, newname1);
   EXPECT_EQ(1, change_count());
 
   const AvatarMenu::Item& item1next = menu->GetItemAt(0);
   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