This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.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/saml/saml_offline_signin_limiter.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 27 matching lines @@
 }
 
 void SAMLOfflineSigninLimiter::SignedIn(UserContext::AuthFlow auth_flow) {
   PrefService* prefs = profile_->GetPrefs();
   const user_manager::User* user =
       ProfileHelper::Get()->GetUserByProfile(profile_);
   if (!user) {
     NOTREACHED();
     return;
   }
-  const std::string& user_id = user->email();
+  const AccountId account_id = user->GetAccountId();
 
   if (auth_flow == UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML) {
     // The user went through online authentication and GAIA did not redirect to
     // a SAML IdP. No limit applies in this case. Clear the time of last login
     // with SAML and the flag enforcing online login, then return.
     prefs->ClearPref(prefs::kSAMLLastGAIASignInTime);
-    user_manager::UserManager::Get()->SaveForceOnlineSignin(user_id, false);
+    user_manager::UserManager::Get()->SaveForceOnlineSignin(account_id, false);
     return;
   }
 
   if (auth_flow == UserContext::AUTH_FLOW_GAIA_WITH_SAML) {
     // The user went through online authentication and GAIA did redirect to a
     // SAML IdP. Update the time of last login with SAML and clear the flag
     // enforcing online login. The flag will be set again when the limit
     // expires. If the limit already expired (e.g. because it was set to zero),
     // the flag will be set again immediately.
-    user_manager::UserManager::Get()->SaveForceOnlineSignin(user_id, false);
+    user_manager::UserManager::Get()->SaveForceOnlineSignin(account_id, false);
     prefs->SetInt64(prefs::kSAMLLastGAIASignInTime,
                     clock_->Now().ToInternalValue());
   }
 
   // Start listening for pref changes.
   pref_change_registrar_.Init(prefs);
   pref_change_registrar_.Add(prefs::kSAMLOfflineSigninTimeLimit,
                              base::Bind(&SAMLOfflineSigninLimiter::UpdateLimit,
                                         base::Unretained(this)));
 
@@ skipping 60 matching lines @@
 }
 
 void SAMLOfflineSigninLimiter::ForceOnlineLogin() {
   const user_manager::User* user =
       ProfileHelper::Get()->GetUserByProfile(profile_);
   if (!user) {
     NOTREACHED();
     return;
   }
 
-  user_manager::UserManager::Get()->SaveForceOnlineSignin(user->email(), true);
-  RecordReauthReason(user->email(), ReauthReason::SAML_REAUTH_POLICY);
+  user_manager::UserManager::Get()->SaveForceOnlineSignin(user->GetAccountId(),
+                                                          true);
+  RecordReauthReason(user->GetAccountId(), ReauthReason::SAML_REAUTH_POLICY);
   offline_signin_limit_timer_.reset();
 }
 
 }  // namespace chromeos