This CL replaces e-mail with AccountId on user selection screen.

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
index e0523daaa94c3956972a3bb755988cd95525c5e1..70f531238c4d922774033a62ffad9e12db3b558d 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -834,7 +834,8 @@ void GaiaScreenHandler::LoadAuthExtension(bool force,
   context.is_enrolling_consumer_management = is_enrolling_consumer_management_;
 
   std::string gaia_id;
-  if (user_manager::UserManager::Get()->FindGaiaID(
+  if (!context.email.empty() &&
+      user_manager::UserManager::Get()->FindGaiaID(
           AccountId::FromUserEmail(context.email), &gaia_id))
     context.gaia_id = gaia_id;

[stevenjb, 2015/11/11 20:39:23]

nit: Add {} while you're in here.

[Alexander Alekseev, 2015/11/12 06:53:04]

Done.