This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/power/power_prefs_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 "chrome/browser/chromeos/power/power_prefs.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 223 matching lines @@
   EXPECT_EQ(GetExpectedPowerPolicyForProfile(login_profile, UNLOCKED),
             GetCurrentPowerPolicy());
 }
 
 TEST_F(PowerPrefsTest, UserSession) {
   FakeChromeUserManager* user_manager = new FakeChromeUserManager();
   ScopedUserManagerEnabler user_manager_enabler(user_manager);
 
   // Set up user profile.
   const char test_user1[] = "test-user1@example.com";
-  user_manager->AddUser(test_user1);
-  user_manager->LoginUser(test_user1);
+  const AccountId test_account_id1(AccountId::FromUserEmail(test_user1));
+  user_manager->AddUser(test_account_id1);
+  user_manager->LoginUser(test_account_id1);
   TestingProfile* user_profile =
-      profile_manager_.CreateTestingProfile(test_user1);
+      profile_manager_.CreateTestingProfile(test_account_id1.GetUserEmail());
 
   profile_manager_.SetLoggedIn(true);
 
   // Inform power_prefs_ that a session has started.
   power_prefs_->Observe(chrome::NOTIFICATION_SESSION_STARTED,
                         content::Source<PowerPrefsTest>(this),
                         content::NotificationService::NoDetails());
 
   EXPECT_EQ(user_profile, GetProfile());
   EXPECT_EQ(GetExpectedPowerPolicyForProfile(user_profile, UNLOCKED),
             GetCurrentPowerPolicy());
   EXPECT_EQ(GetExpectedAllowScreenWakeLocksForProfile(user_profile),
             GetCurrentAllowScreenWakeLocks());
 
   const char test_user2[] = "test-user2@example.com";
-  user_manager->AddUser(test_user2);
-  user_manager->LoginUser(test_user2);
+  const AccountId test_account_id2(AccountId::FromUserEmail(test_user2));
+  user_manager->AddUser(test_account_id2);
+  user_manager->LoginUser(test_account_id2);
   TestingProfile* other_profile =
-      profile_manager_.CreateTestingProfile(test_user2);
+      profile_manager_.CreateTestingProfile(test_account_id2.GetUserEmail());
 
   // Inform power_prefs_ that an unrelated profile has been destroyed.
   power_prefs_->Observe(chrome::NOTIFICATION_PROFILE_DESTROYED,
                         content::Source<Profile>(other_profile),
                         content::NotificationService::NoDetails());
 
   // Verify that the user profile's power prefs are still being used.
   EXPECT_EQ(user_profile, GetProfile());
   EXPECT_EQ(GetExpectedPowerPolicyForProfile(user_profile, UNLOCKED),
             GetCurrentPowerPolicy());
@@ skipping 18 matching lines @@
                         content::Source<Profile>(user_profile),
                         content::NotificationService::NoDetails());
 
   // The user profile's prefs should still be used.
   EXPECT_FALSE(GetProfile());
   EXPECT_EQ(GetExpectedPowerPolicyForProfile(user_profile, UNLOCKED),
             GetCurrentPowerPolicy());
 }
 
 }  // namespace chromeos