Add gaia_id to ProfileInfoCache.

chrome/browser/profiles/profile_list_desktop.cc

 // Copyright 2013 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/profiles/profile_list_desktop.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 31 matching lines @@
     if (profile_info_->IsOmittedProfileAtIndex(i)) {
       omitted_item_count_++;
       continue;
     }
 
     gfx::Image icon = profile_info_->GetAvatarIconOfProfileAtIndex(i);
     AvatarMenu::Item* item = new AvatarMenu::Item(i - omitted_item_count_,
                                                   i,
                                                   icon);
     item->name = profile_info_->GetNameOfProfileAtIndex(i);
-    item->sync_state = profile_info_->GetUserNameOfProfileAtIndex(i);
+    item->username = profile_info_->GetUserNameOfProfileAtIndex(i);
     item->profile_path = profile_info_->GetPathOfProfileAtIndex(i);
     item->legacy_supervised =
         profile_info_->ProfileIsLegacySupervisedAtIndex(i);
     item->child_account = profile_info_->ProfileIsChildAtIndex(i);
-    item->signed_in = !item->sync_state.empty();
+    item->signed_in = profile_info_->ProfileIsAuthenticatedAtIndex(i);
     if (!item->signed_in) {
-      item->sync_state = l10n_util::GetStringUTF16(
+      item->username = l10n_util::GetStringUTF16(
           item->legacy_supervised ? IDS_SUPERVISED_USER_AVATAR_LABEL :
                                     IDS_PROFILES_LOCAL_PROFILE_STATE);
     }
     item->active = profile_info_->GetPathOfProfileAtIndex(i) ==
         active_profile_path_;
     item->signin_required = profile_info_->ProfileIsSigninRequiredAtIndex(i);
     items_.push_back(item);
   }
   // One omitted item is expected when a supervised-user profile is in the
   // process of being registered, but there shouldn't be more than one.
@@ skipping 22 matching lines @@
 }
 
 void ProfileListDesktop::ActiveProfilePathChanged(base::FilePath& path) {
   active_profile_path_ = path;
 }
 
 void ProfileListDesktop::ClearMenu() {
   STLDeleteElements(&items_);
   omitted_item_count_ = 0;
 }