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

components/user_manager/user_manager_base.h

 // 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.
 
 #ifndef COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_
 #define COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 111 matching lines @@
                                bool* out_value) override;
   void SetKnownUserBooleanPref(const UserID& user_id,
                                const std::string& path,
                                const bool in_value) override;
   bool GetKnownUserIntegerPref(const UserID& user_id,
                                const std::string& path,
                                int* out_value) override;
   void SetKnownUserIntegerPref(const UserID& user_id,
                                const std::string& path,
                                const int in_value) override;
+  bool GetKnownUserCanonicalEmail(const UserID& user_id,
+                                  std::string* out_email) override;
   void UpdateGaiaID(const UserID& user_id, const std::string& gaia_id) override;
   bool FindGaiaID(const UserID& user_id, std::string* out_value) override;
   void UpdateUsingSAML(const std::string& user_id,
                        const bool using_saml) override;
   bool FindUsingSAML(const std::string& user_id) override;
   void SetKnownUserDeviceId(const UserID& user_id,
                             const std::string& device_id) override;
   std::string GetKnownUserDeviceId(const UserID& user_id) override;
   void SetKnownUserGAPSCookie(const UserID& user_id,
                               const std::string& gaps_cookie) override;
@@ skipping 286 matching lines @@
   scoped_refptr<base::TaskRunner> blocking_task_runner_;
 
   base::WeakPtrFactory<UserManagerBase> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerBase);
 };
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_