Make sure GetAuthenticatedAccountId() returns a canonicalized id.

chrome/browser/signin/signin_ui_util.cc

 // Copyright (c) 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/signin/signin_ui_util.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 84 matching lines @@
   return l10n_util::GetStringFUTF16(IDS_SYNC_MENU_PRE_SYNCED_LABEL,
       l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
 }
 
 // Given an authentication state this helper function returns various labels
 // that can be used to display information about the state.
 void GetStatusLabelsForAuthError(Profile* profile,
                                  const SigninManagerBase& signin_manager,
                                  base::string16* status_label,
                                  base::string16* link_label) {
-  base::string16 username =
-      base::UTF8ToUTF16(signin_manager.GetAuthenticatedUsername());
   base::string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
   if (link_label)
     link_label->assign(l10n_util::GetStringUTF16(IDS_SYNC_RELOGIN_LINK_LABEL));
 
   const GoogleServiceAuthError::State state =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile)->
           signin_error_controller()->auth_error().state();
   switch (state) {
     case GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS:
     case GoogleServiceAuthError::SERVICE_ERROR:
     case GoogleServiceAuthError::ACCOUNT_DELETED:
     case GoogleServiceAuthError::ACCOUNT_DISABLED:
       // If the user name is empty then the first login failed, otherwise the
       // credentials are out-of-date.
-      if (username.empty()) {
+      if (!signin_manager.IsAuthenticated()) {
         if (status_label) {
           status_label->assign(
               l10n_util::GetStringUTF16(IDS_SYNC_INVALID_USER_CREDENTIALS));
         }
       } else {
         if (status_label) {
           status_label->assign(
               l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_INFO_OUT_OF_DATE));
         }
       }
@@ skipping 50 matching lines @@
   std::string email = account_tracker->GetAccountInfo(account_id).email;
   if (email.empty()) {
     DCHECK_EQ(AccountTrackerService::MIGRATION_NOT_STARTED,
               account_tracker->GetMigrationState());
     return account_id;
   }
   return email;
 }
 
 }  // namespace signin_ui_util