Canonicalize the authenticated username on iOS.

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 (!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
     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_;
@@ skipping 73 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));
 }