This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/signin/auth_sync_observer.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/auth_sync_observer.h"
 
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/login/reauth_stats.h"
@@ skipping 44 matching lines @@
       sync_service->GetAuthError().state();
   if (state != GoogleServiceAuthError::NONE &&
       state != GoogleServiceAuthError::CONNECTION_FAILED &&
       state != GoogleServiceAuthError::SERVICE_UNAVAILABLE &&
       state != GoogleServiceAuthError::REQUEST_CANCELED) {
     // Invalidate OAuth2 refresh token to force Gaia sign-in flow. This is
     // needed because sign-out/sign-in solution is suggested to the user.
     // TODO(nkostylev): Remove after crosbug.com/25978 is implemented.
     LOG(WARNING) << "Invalidate OAuth token because of a sync error: "
                  << sync_service->GetAuthError().ToString();
-    std::string email = user->email();
-    DCHECK(!email.empty());
+    const AccountId& account_id = user->GetAccountId();
+    DCHECK(account_id.is_valid());
     // TODO(nkostyelv): Change observer after active user has changed.
     user_manager::User::OAuthTokenStatus old_status =
         user->oauth_token_status();
     user_manager::UserManager::Get()->SaveUserOAuthStatus(
-        email, user_manager::User::OAUTH2_TOKEN_STATUS_INVALID);
-    RecordReauthReason(email, ReauthReason::SYNC_FAILED);
+        account_id, user_manager::User::OAUTH2_TOKEN_STATUS_INVALID);
+    RecordReauthReason(account_id, ReauthReason::SYNC_FAILED);
     if (user->GetType() == user_manager::USER_TYPE_SUPERVISED &&
         old_status != user_manager::User::OAUTH2_TOKEN_STATUS_INVALID) {
        // Attempt to restore token from file.
       ChromeUserManager::Get()
           ->GetSupervisedUserManager()
           ->LoadSupervisedUserToken(
               profile_,
               base::Bind(&AuthSyncObserver::OnSupervisedTokenLoaded,
                          base::Unretained(this)));
        content::RecordAction(
            base::UserMetricsAction("ManagedUsers_Chromeos_Sync_Invalidated"));
     }
   } else if (state == GoogleServiceAuthError::NONE) {
     if (user->GetType() == user_manager::USER_TYPE_SUPERVISED &&
         user->oauth_token_status() ==
             user_manager::User::OAUTH2_TOKEN_STATUS_INVALID) {
       LOG(ERROR) <<
           "Got an incorrectly invalidated token case, restoring token status.";
       user_manager::UserManager::Get()->SaveUserOAuthStatus(
-          user->email(), user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
+          user->GetAccountId(), user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
        content::RecordAction(
            base::UserMetricsAction("ManagedUsers_Chromeos_Sync_Recovered"));
     }
   }
 }
 
 void AuthSyncObserver::OnSupervisedTokenLoaded(const std::string& token) {
   ChromeUserManager::Get()->GetSupervisedUserManager()->ConfigureSyncWithToken(
       profile_, token);
 }
 
 }  // namespace chromeos