Add gaia_id to ProfileInfoCache.

chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 207 matching lines @@
     [shadow setShadowColor:[NSColor colorWithCalibratedWhite:1.0 alpha:0.4]];
   }
 
   const ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   // If there is a single local profile, then use the generic avatar button
   // instead of the profile name. Never use the generic button if the active
   // profile is Guest.
   bool useGenericButton = (!browser_->profile()->IsGuestSession() &&
                            cache.GetNumberOfProfiles() == 1 &&
-                           cache.GetUserNameOfProfileAtIndex(0).empty());
+                           !cache.ProfileIsAuthenticatedAtIndex(0));
 
 
   NSString* buttonTitle = base::SysUTF16ToNSString(useGenericButton ?
       base::string16() :
       profiles::GetAvatarButtonTextForProfile(browser_->profile()));
   [[button_ cell] setHasError:hasError_ withTitle:buttonTitle];
 
   AvatarButton* button =
       base::mac::ObjCCastStrict<AvatarButton>(button_);
   if (useGenericButton) {
@@ skipping 44 matching lines @@
         layoutSubviews];
   }
 }
 
 - (void)updateErrorStatus:(BOOL)hasError {
   hasError_ = hasError;
   [self updateAvatarButtonAndLayoutParent:YES];
 }
 
 @end