This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/login_manager_test.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/login/login_manager_test.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 30 matching lines @@
 
 namespace {
 
 const char kGAIAHost[] = "accounts.google.com";
 const char kTestUserinfoToken1[] = "fake-userinfo-token-1";
 const char kTestRefreshToken1[] = "fake-refresh-token-1";
 const char kTestUserinfoToken2[] = "fake-userinfo-token-2";
 const char kTestRefreshToken2[] = "fake-refresh-token-2";
 
 UserContext CreateUserContext(const std::string& user_id) {
-  UserContext user_context(user_id);
+  UserContext user_context(AccountId::FromUserEmailGaiaId(
+      user_id, LoginManagerTest::GetGaiaIDForUserID(user_id)));
   user_context.SetGaiaID(LoginManagerTest::GetGaiaIDForUserID(user_id));
   user_context.SetKey(Key("password"));
   if (user_id == LoginManagerTest::kEnterpriseUser1) {
     user_context.SetRefreshToken(kTestRefreshToken1);
   } else if (user_id == LoginManagerTest::kEnterpriseUser2) {
     user_context.SetRefreshToken(kTestRefreshToken2);
   }
   return user_context;
 }
 
@@ skipping 99 matching lines @@
   test::UserSessionManagerTestApi session_manager_test_api(
       UserSessionManager::GetInstance());
   session_manager_test_api.InjectStubUserContext(user_context);
 }
 
 bool LoginManagerTest::TryToLogin(const UserContext& user_context) {
   if (!AddUserToSession(user_context))
     return false;
   if (const user_manager::User* active_user =
           user_manager::UserManager::Get()->GetActiveUser())
-    return active_user->email() == user_context.GetUserID();
+    return active_user->GetAccountId() == user_context.GetAccountId();
   return false;
 }
 
 bool LoginManagerTest::AddUserToSession(const UserContext& user_context) {
   ExistingUserController* controller =
       ExistingUserController::current_controller();
   if (!controller) {
     ADD_FAILURE();
     return false;
   }
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_SESSION_STARTED,
       content::NotificationService::AllSources());
   controller->Login(user_context, SigninSpecifics());
   observer.Wait();
   const user_manager::UserList& logged_users =
       user_manager::UserManager::Get()->GetLoggedInUsers();
   for (user_manager::UserList::const_iterator it = logged_users.begin();
        it != logged_users.end();
        ++it) {
-    if ((*it)->email() == user_context.GetUserID())
+    if ((*it)->GetAccountId() == user_context.GetAccountId())
       return true;
   }
   return false;
 }
 
 void LoginManagerTest::LoginUser(const std::string& user_id) {
   const UserContext user_context = CreateUserContext(user_id);
   SetExpectedCredentials(user_context);
   EXPECT_TRUE(TryToLogin(user_context));
 }
@@ skipping 18 matching lines @@
   EXPECT_TRUE(host != NULL);
 
   content::WebContents* web_contents =
       host->GetWebUILoginView()->GetWebContents();
   EXPECT_TRUE(web_contents != NULL);
   set_web_contents(web_contents);
   js_checker_.set_web_contents(web_contents);
 }
 
 }  // namespace chromeos