Canonicalize user ID passed via chromeos::switches::kLoginUser

chrome/browser/chromeos/login/helper.cc

Index: chrome/browser/chromeos/login/helper.cc
diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc
index 82662c07d71f9be27179c265faf0e2edc76df7f0..fc68d9fb3ffe284de73a4a773e5417d901baabe3 100644
--- a/chrome/browser/chromeos/login/helper.cc
+++ b/chrome/browser/chromeos/login/helper.cc
@@ -6,10 +6,12 @@
 
 #include "ash/shell.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/shill_property_util.h"
+#include "google_apis/gaia/gaia_auth_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
@@ -42,6 +44,12 @@ int GetCurrentUserImageSize() {
 
 namespace login {
 
+std::string CanonicalizeUserID(const std::string& user_id) {
+  if (user_id == UserManager::kGuestUserName)
+    return user_id;
+  return gaia::CanonicalizeEmail(user_id);
+}
+
 NetworkStateHelper::NetworkStateHelper() {}
 NetworkStateHelper::~NetworkStateHelper() {}