Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

chrome/browser/chromeos/login/session/user_session_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/session/user_session_manager.h"
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 897 matching lines @@
   if (user_manager::UserManager::Get()->IsLoggedInAsSupervisedUser()) {
     user_manager::User* active_user =
         user_manager::UserManager::Get()->GetActiveUser();
     std::string supervised_user_sync_id =
         ChromeUserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(
             active_user->email());
     profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
                                    supervised_user_sync_id);
   } else if (user_manager::UserManager::Get()->
       IsLoggedInAsUserWithGaiaAccount()) {
-    // Prime the account tracker with this combination of gaia id/display email.
-    // Don't do this unless both email and gaia_id are valid.  They may not
-    // be when simply unlocking the profile.
-    if (!user_context.GetGaiaID().empty() &&
-        !user_context.GetUserID().empty()) {
+    // Get the Gaia ID from the user context.  If it's not available, this may
+    // not be available when unlocking a previously opened profile, or when
+    // creating a supervised users.  However, in these cases the gaia_id should
+    // be already available in the account tracker.
+    std::string gaia_id = user_context.GetGaiaID();
+    if (gaia_id.empty()) {
       AccountTrackerService* account_tracker =
           AccountTrackerServiceFactory::GetForProfile(profile);
-      account_tracker->SeedAccountInfo(user_context.GetGaiaID(),
-                                       user_context.GetUserID());
+      AccountTrackerService::AccountInfo info =
+          account_tracker->FindAccountInfoByEmail(user_context.GetUserID());
+      gaia_id = info.gaia;
+      DCHECK(!gaia_id.empty());
     }
 
     // Make sure that the google service username is properly set (we do this
     // on every sign in, not just the first login, to deal with existing
     // profiles that might not have it set yet).
     SigninManagerBase* signin_manager =
         SigninManagerFactory::GetForProfile(profile);
-    signin_manager->SetAuthenticatedUsername(user_context.GetUserID());
+    signin_manager->SetAuthenticatedAccountInfo(user_context.GetGaiaID(),

[xiyuan, 2015/04/09 20:59:21]

Did you mean to use |gaia_id| here?

[Roger Tawa OOO till Jul 10th, 2015/04/10 01:52:57]

Yes.  First param is gaia-id, second is email.

[xiyuan, 2015/04/10 02:50:45]

user_context.GetGaiaID() could return an empty string and we retrieve a copy
from AccountTrackerService in |gaia_id|. But the value is not used and we still
pass user_context.GetGaiaID() here. Then what is the purpose of the code in
918-929?

Should we use |gaia_id| here?
i.e.
signin_manager->SetAuthenticatedAccountInfo(gaia_id, user_context.GetUserID());

[Roger Tawa OOO till Jul 10th, 2015/04/10 12:22:13]

Oops, you are correct, totally missed that.  Done.  (Probably due to bad merged
on my part when I moved code written on my linux box to my windows box for
uploading to CL).

+                                                user_context.GetUserID());
   }
 }
 
 void UserSessionManager::UserProfileInitialized(Profile* profile,
                                                 bool is_incognito_profile,
                                                 const std::string& user_id) {
   // Demo user signed in.
   if (is_incognito_profile) {
     profile->OnLogin();
 
@@ skipping 662 matching lines @@
     if (is_enterprise_managed)
       display = USER_PODS_DISPLAY_DISABLED_MANAGED;
     else
       display = USER_PODS_DISPLAY_DISABLED_REGULAR;
   }
   UMA_HISTOGRAM_ENUMERATION("UserSessionManager.UserPodsDisplay", display,
                             NUM_USER_PODS_DISPLAY);
 }
 
 }  // namespace chromeos