This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/signin/oauth2_browsertest.cc

 // Copyright 2014 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 "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/login/auth/key.h"
 #include "chromeos/login/auth/user_context.h"
 #include "components/app_modal/javascript_app_modal_dialog.h"
 #include "components/app_modal/native_app_modal_dialog.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "extensions/test/result_catcher.h"
 #include "google_apis/gaia/gaia_constants.h"
@@ skipping 148 matching lines @@
     JsExpect("!!document.querySelector('#account-picker')");
     JsExpect("!!document.querySelector('#pod-row')");
 
     std::string account_id = PickAccountId(
         ProfileManager::GetPrimaryUserProfile(), kTestGaiaId, kTestEmail);
 
     EXPECT_EQ(GetOAuthStatusFromLocalState(account_id),
               user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
 
     // Try login.  Primary profile has changed.
-    EXPECT_TRUE(TryToLogin(kTestGaiaId, kTestEmail, kTestAccountPassword));
+    EXPECT_TRUE(
+        TryToLogin(AccountId::FromUserEmailGaiaId(kTestEmail, kTestGaiaId),
+                   kTestAccountPassword));
     Profile* profile = ProfileManager::GetPrimaryUserProfile();
 
     // Wait for the session merge to finish.
     WaitForMergeSessionCompletion(OAuth2LoginManager::SESSION_RESTORE_DONE);
 
     // Check for existance of refresh token.
     ProfileOAuth2TokenService* token_service =
           ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
     EXPECT_TRUE(token_service->RefreshTokenIsAvailable(account_id));
 
     EXPECT_EQ(GetOAuthStatusFromLocalState(account_id),
               user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
   }
 
-  bool TryToLogin(const std::string& gaia_id,
-                  const std::string& username,
-                  const std::string& password) {
-    if (!AddUserToSession(gaia_id, username, password))
+  bool TryToLogin(const AccountId& account_id, const std::string& password) {
+    if (!AddUserToSession(account_id, password))
       return false;
 
     if (const user_manager::User* active_user =
             user_manager::UserManager::Get()->GetActiveUser()) {
-      return active_user->email() == username;
+      return active_user->GetAccountId() == account_id;
     }
 
     return false;
   }
 
   user_manager::User::OAuthTokenStatus GetOAuthStatusFromLocalState(
       const std::string& account_id) const {
     PrefService* local_state = g_browser_process->local_state();
     const base::DictionaryValue* prefs_oauth_status =
         local_state->GetDictionary("OAuthTokenStatus");
@@ skipping 10 matching lines @@
 
  protected:
   // OobeBaseTest overrides.
   Profile* profile() override {
     if (user_manager::UserManager::Get()->GetActiveUser())
       return ProfileManager::GetPrimaryUserProfile();
 
     return OobeBaseTest::profile();
   }
 
-  bool AddUserToSession(const std::string& gaia_id,
-                        const std::string& username,
+  bool AddUserToSession(const AccountId& account_id,
                         const std::string& password) {
     ExistingUserController* controller =
         ExistingUserController::current_controller();
     if (!controller) {
       ADD_FAILURE();
       return false;
     }
 
-    UserContext user_context(username);
-    user_context.SetGaiaID(gaia_id);
+    UserContext user_context(account_id);
+    user_context.SetGaiaID(account_id.GetGaiaId());
     user_context.SetKey(Key(password));
     controller->Login(user_context, SigninSpecifics());
     content::WindowedNotificationObserver(
         chrome::NOTIFICATION_SESSION_STARTED,
         content::NotificationService::AllSources()).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() == username)
+      if ((*it)->GetAccountId() == account_id)
         return true;
     }
     return false;
   }
 
   void SetupGaiaServerWithAccessTokens() {
     fake_gaia_->MapEmailToGaiaId(kTestEmail, kTestGaiaId);
 
     // Configure OAuth authentication.
     GaiaUrls* gaia_urls = GaiaUrls::GetInstance();
@@ skipping 200 matching lines @@
     chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
     content::NotificationService::AllSources()).Wait();
 
   JsExpect("!!document.querySelector('#account-picker')");
   JsExpect("!!document.querySelector('#pod-row')");
 
   std::string account_id = PickAccountId(profile(), kTestGaiaId, kTestEmail);
   EXPECT_EQ(GetOAuthStatusFromLocalState(account_id),
             user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
 
-  EXPECT_TRUE(TryToLogin(kTestGaiaId, kTestEmail, kTestAccountPassword));
+  EXPECT_TRUE(
+      TryToLogin(AccountId::FromUserEmailGaiaId(kTestEmail, kTestGaiaId),
+                 kTestAccountPassword));
 
   // Wait for the session merge to finish.
   WaitForMergeSessionCompletion(OAuth2LoginManager::SESSION_RESTORE_FAILED);
 
   EXPECT_EQ(GetOAuthStatusFromLocalState(account_id),
             user_manager::User::OAUTH2_TOKEN_STATUS_INVALID);
 }
 
 
 const char kGooglePageContent[] =
@@ skipping 296 matching lines @@
 
   if (!catcher.GetNextResult()) {
     std::string message = catcher.message();
     ADD_FAILURE() << "Tests failed: " << message;
   }
 
   EXPECT_TRUE(fake_google_.IsPageRequested());
 }
 
 }  // namespace chromeos