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

components/signin/core/browser/mutable_profile_oauth2_token_service.cc

 // Copyright 2015 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/core/browser/mutable_profile_oauth2_token_service.h"
 
 #include "base/profiler/scoped_tracker.h"
 #include "components/signin/core/browser/signin_client.h"
 #include "components/signin/core/browser/signin_metrics.h"
 #include "components/signin/core/browser/webdata/token_web_data.h"
@@ skipping 94 matching lines @@
     last_auth_error_ = error;
     signin_error_controller_->AuthStatusChanged();
   }
 }
 
 std::string
 MutableProfileOAuth2TokenService::AccountInfo::GetAccountId() const {
   return account_id_;
 }
 
-std::string
-MutableProfileOAuth2TokenService::AccountInfo::GetUsername() const {
-  // TODO(rogerta): when |account_id| becomes the obfuscated gaia id, this
-  // will need to be changed.
-  return account_id_;
-}
-
 GoogleServiceAuthError
 MutableProfileOAuth2TokenService::AccountInfo::GetAuthStatus() const {
   return last_auth_error_;
 }
 
 MutableProfileOAuth2TokenService::MutableProfileOAuth2TokenService()
     : web_data_service_request_(0),
       backoff_entry_(&backoff_policy_),
       backoff_error_(GoogleServiceAuthError::NONE) {
   VLOG(1) << "MutablePO2TS::MutablePO2TS";
@@ skipping 69 matching lines @@
 
 void MutableProfileOAuth2TokenService::LoadCredentials(
     const std::string& primary_account_id) {
   DCHECK(!primary_account_id.empty());
   ValidateAccountId(primary_account_id);
   DCHECK(loading_primary_account_id_.empty());
   DCHECK_EQ(0, web_data_service_request_);
 
   CancelAllRequests();
   refresh_tokens().clear();
-  loading_primary_account_id_ = primary_account_id;
+
+  // If the account_id is an email address, then canonicalize it.  This
+  // is to support legacy account_ids, and will not be needed after
+  // switching to gaia-ids.
+  if (primary_account_id.find('@') != std::string::npos) {
+    loading_primary_account_id_ = gaia::CanonicalizeEmail(primary_account_id);
+  } else {
+    loading_primary_account_id_ = primary_account_id;
+  }
+
   scoped_refptr<TokenWebData> token_web_data = client()->GetDatabase();
   if (token_web_data.get())
     web_data_service_request_ = token_web_data->GetAllTokens(this);
 }
 
 void MutableProfileOAuth2TokenService::OnWebDataServiceRequestDone(
     WebDataServiceBase::Handle handle,
     const WDTypedResult* result) {
   VLOG(1) << "MutablePO2TS::OnWebDataServiceRequestDone. Result type: "
           << (result == nullptr ? -1 : (int)result->GetType());
@@ skipping 237 matching lines @@
 }
 
 void MutableProfileOAuth2TokenService::CancelWebTokenFetch() {
   if (web_data_service_request_ != 0) {
     scoped_refptr<TokenWebData> token_web_data = client()->GetDatabase();
     DCHECK(token_web_data.get());
     token_web_data->CancelRequest(web_data_service_request_);
     web_data_service_request_  = 0;
   }
 }