Profile chooser on mac was passing wrong value to signin error controller.

components/signin/ios/browser/profile_oauth2_token_service_ios.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.
 
 #include "components/signin/ios/browser/profile_oauth2_token_service_ios.h"
 
 #include <Foundation/Foundation.h>
 
 #include <set>
 #include <string>
@@ skipping 144 matching lines @@
   if (error.state() != last_auth_error_.state()) {
     last_auth_error_ = error;
     signin_error_controller_->AuthStatusChanged();
   }
 }
 
 std::string ProfileOAuth2TokenServiceIOS::AccountInfo::GetAccountId() const {
   return account_id_;
 }
 
-std::string ProfileOAuth2TokenServiceIOS::AccountInfo::GetUsername() const {
-  // TODO(rogerta): when |account_id| becomes the obfuscated gaia id, this
-  // will need to be changed.
-  return account_id_;
-}
-
 GoogleServiceAuthError
 ProfileOAuth2TokenServiceIOS::AccountInfo::GetAuthStatus() const {
   return last_auth_error_;
 }
 
 ProfileOAuth2TokenServiceIOS::ProfileOAuth2TokenServiceIOS()
     : ProfileOAuth2TokenService() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
@@ skipping 315 matching lines @@
   client()->GetPrefs()->SetBoolean(
       prefs::kTokenServiceExcludeAllSecondaryAccounts, true);
 }
 
 void ProfileOAuth2TokenServiceIOS::ClearExcludedSecondaryAccounts() {
   client()->GetPrefs()->ClearPref(
       prefs::kTokenServiceExcludeAllSecondaryAccounts);
   client()->GetPrefs()->ClearPref(
       prefs::kTokenServiceExcludedSecondaryAccounts);
 }