This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/signin/oauth2_login_manager.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 "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/gaia_cookie_manager_service_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chromeos/chromeos_switches.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/signin/core/browser/signin_client.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_urls.h"
 
 namespace chromeos {
@@ skipping 72 matching lines @@
     VLOG(1) << "OAuth2 refresh token is already loaded.";
     VerifySessionCookies();
   } else {
     VLOG(1) << "Loading OAuth2 refresh token from database.";
 
     // Flag user with unknown token status in case there are no saved tokens
     // and OnRefreshTokenAvailable is not called. Flagging it here would
     // cause user to go through Gaia in next login to obtain a new refresh
     // token.
     user_manager::UserManager::Get()->SaveUserOAuthStatus(
-        primary_account_id, user_manager::User::OAUTH_TOKEN_STATUS_UNKNOWN);
+        AccountId::FromUserEmail(primary_account_id),
+        user_manager::User::OAUTH_TOKEN_STATUS_UNKNOWN);
 
     token_service->LoadCredentials(primary_account_id);
   }
 }
 
 void OAuth2LoginManager::Stop() {
   oauth2_token_fetcher_.reset();
   login_verifier_.reset();
 }
 
 bool OAuth2LoginManager::SessionRestoreIsRunning() const {
   return state_ == SESSION_RESTORE_PREPARING ||
          state_ == SESSION_RESTORE_IN_PROGRESS;
 }
 
 bool OAuth2LoginManager::ShouldBlockTabLoading() const {
   return SessionRestoreIsRunning();
 }
 
 void OAuth2LoginManager::OnRefreshTokenAvailable(
-    const std::string& account_id) {
+    const std::string& user_email) {
   VLOG(1) << "OnRefreshTokenAvailable";
 
   if (state_ == SESSION_RESTORE_NOT_STARTED)
     return;
 
   // TODO(fgorski): Once ProfileOAuth2TokenService supports multi-login, make
-  // sure to restore session cookies in the context of the correct account_id.
+  // sure to restore session cookies in the context of the correct user_email.
 
   // Do not validate tokens for supervised users, as they don't actually have
   // oauth2 token.
   if (user_manager::UserManager::Get()->IsLoggedInAsSupervisedUser()) {
     VLOG(1) << "Logged in as supervised user, skip token validation.";
     return;
   }
   // Only restore session cookies for the primary account in the profile.
-  if (GetPrimaryAccountId() == account_id) {
+  if (GetPrimaryAccountId() == user_email) {
     // Token is loaded. Undo the flagging before token loading.
     user_manager::UserManager::Get()->SaveUserOAuthStatus(
-        account_id, user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
+        AccountId::FromUserEmail(user_email),
+        user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
     VerifySessionCookies();
   }
 }
 
 ProfileOAuth2TokenService* OAuth2LoginManager::GetTokenService() {
   return ProfileOAuth2TokenServiceFactory::GetForProfile(user_profile_);
 }
 
 const std::string& OAuth2LoginManager::GetPrimaryAccountId() {
   SigninManagerBase* signin_manager =
@@ skipping 247 matching lines @@
   FOR_EACH_OBSERVER(Observer, observer_list_,
                     OnSessionRestoreStateChanged(user_profile_, state_));
 }
 
 void OAuth2LoginManager::SetSessionRestoreStartForTesting(
     const base::Time& time) {
   session_restore_start_ = time;
 }
 
 }  // namespace chromeos