Make sure GetAuthenticatedAccountId() returns a canonicalized id.

components/signin/core/browser/signin_manager_base.cc

 // 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/core/browser/signin_manager_base.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 23 matching lines @@
 
   // If the user is clearing the token service from the command line, then
   // clear their login info also (not valid to be logged in without any
   // tokens).
   CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   if (cmd_line->HasSwitch(switches::kClearTokenService))
     client_->GetPrefs()->ClearPref(prefs::kGoogleServicesUsername);
 
   std::string user =
       client_->GetPrefs()->GetString(prefs::kGoogleServicesUsername);
-  if (!user.empty()) {
-#if defined(OS_IOS)
-    // Prior to M38, Chrome on iOS did not normalize the email before setting
-    // it in SigninManager. |AccountReconcilor| expects the authenticated email
-    // to be normalized as it used as an account identifier and is compared
-    // to the accounts available in the cookies.
-    user = gaia::CanonicalizeEmail(gaia::SanitizeEmail(user));
-#endif
+  if (!user.empty())
     SetAuthenticatedUsername(user);
-  }
 }
 
 bool SigninManagerBase::IsInitialized() const { return initialized_; }
 
 bool SigninManagerBase::IsSigninAllowed() const {
   return client_->GetPrefs()->GetBoolean(prefs::kSigninAllowed);
 }
 
 const std::string& SigninManagerBase::GetAuthenticatedUsername() const {
   return authenticated_username_;
 }
 
 const std::string& SigninManagerBase::GetAuthenticatedAccountId() const {
-  return GetAuthenticatedUsername();
+  return authenticated_account_id_;
 }
 
 void SigninManagerBase::SetAuthenticatedUsername(const std::string& username) {
   if (!authenticated_username_.empty()) {
     DLOG_IF(ERROR, !gaia::AreEmailsSame(username, authenticated_username_))
         << "Tried to change the authenticated username to something different: "
         << "Current: " << authenticated_username_ << ", New: " << username;
 
 #if defined(OS_IOS)
     // Prior to M26, chrome on iOS did not normalize the email before setting
     // it in SigninManager.  If the emails are the same as given by
     // gaia::AreEmailsSame() but not the same as given by std::string::op==(),
     // make sure to set the authenticated name below.
     if (!gaia::AreEmailsSame(username, authenticated_username_) ||
         username == authenticated_username_) {
       return;
     }
 #else
     return;
 #endif
   }
   std::string pref_username =
       client_->GetPrefs()->GetString(prefs::kGoogleServicesUsername);
   DCHECK(pref_username.empty() || gaia::AreEmailsSame(username, pref_username))
       << "username: " << username << "; pref_username: " << pref_username;
   authenticated_username_ = username;
+
+  // Some tests don't use a real email address for the username.  To support
+  // these cases, don't try to canonicalize these strings.
+  authenticated_account_id_ = (username.find('@') == std::string::npos) ?
+      username : gaia::CanonicalizeEmail(username);
   client_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, username);
   NotifyDiagnosticsObservers(USERNAME, username);
 
   // Go ahead and update the last signed in username here as well. Once a
   // user is signed in the two preferences should match. Doing it here as
   // opposed to on signin allows us to catch the upgrade scenario.
   client_->GetPrefs()->SetString(prefs::kGoogleServicesLastUsername, username);
 }
 
-void SigninManagerBase::clear_authenticated_username() {
+void SigninManagerBase::ClearAuthenticatedUsername() {
   authenticated_username_.clear();
+  authenticated_account_id_.clear();
 }
 
 bool SigninManagerBase::IsAuthenticated() const {
-  return !GetAuthenticatedAccountId().empty();
+  return !authenticated_account_id_.empty();
 }
 
 bool SigninManagerBase::AuthInProgress() const {
   // SigninManagerBase never kicks off auth processes itself.
   return false;
 }
 
 void SigninManagerBase::Shutdown() {}
 
 void SigninManagerBase::AddObserver(Observer* observer) {
@@ skipping 22 matching lines @@
                     NotifySigninValueChanged(field, value));
 }
 
 void SigninManagerBase::NotifyDiagnosticsObservers(
     const TimedSigninStatusField& field,
     const std::string& value) {
   FOR_EACH_OBSERVER(SigninDiagnosticsObserver,
                     signin_diagnostics_observers_,
                     NotifySigninValueChanged(field, value));
 }