We should use UserID object to identify users instead of username.

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"
@@ skipping 90 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);
+        user_manager::UserID::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();
 }
 
@@ skipping 19 matching lines @@
   // 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) {
     // Token is loaded. Undo the flagging before token loading.
     user_manager::UserManager::Get()->SaveUserOAuthStatus(
-        account_id, user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
+        user_manager::UserID::FromUserEmail(account_id), 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