This CL fixes the issue with login using alternative e-mails.

components/user_manager/user_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/user_manager/user_manager_base.h"
 
 #include <cstddef>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 1127 matching lines @@
   // Local State may not be initialized in tests.
   if (!local_state)
     return;
 
   ListPrefUpdate update(local_state, kKnownUsers);
   base::DictionaryValue dict;
   dict.SetInteger(path, in_value);
   UpdateKnownUserPrefs(user_id, dict, false);
 }
 
+bool UserManagerBase::GetKnownUserCanonicalEmail(const UserID& user_id,
+                                                 std::string* out_email) {
+  return GetKnownUserStringPref(user_id, kCanonicalEmail, out_email);
+}
+
 void UserManagerBase::UpdateGaiaID(const UserID& user_id,
                                    const std::string& gaia_id) {
   SetKnownUserStringPref(user_id, kGAIAIdKey, gaia_id);
 }
 
 bool UserManagerBase::FindGaiaID(const UserID& user_id,
                                  std::string* out_value) {
   return GetKnownUserStringPref(user_id, kGAIAIdKey, out_value);
 }
 
@@ skipping 188 matching lines @@
 }
 
 void UserManagerBase::DeleteUser(User* user) {
   const bool is_active_user = (user == active_user_);
   delete user;
   if (is_active_user)
     active_user_ = NULL;
 }
 
 }  // namespace user_manager