ChromeOS cryptohome should be able to use gaia id as user identifier.

chrome/browser/chromeos/login/session/chrome_session_manager.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 "chrome/browser/chromeos/login/session/chrome_session_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sys_info.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/login/session/kiosk_auto_launcher_session_manager_delegate.h"
 #include "chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.h"
 #include "chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.h"
 #include "chrome/browser/chromeos/login/session/stub_login_session_manager_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/cryptohome/cryptohome_parameters.h"
+#include "chromeos/login/auth/utils.h"
 #include "chromeos/login/user_names.h"
 #include "components/signin/core/account_id/account_id.h"
 
 namespace chromeos {
 
 namespace {
 
 bool ShouldAutoLaunchKioskApp(const base::CommandLine& command_line) {
   KioskAppManager* app_manager = KioskAppManager::Get();
   return command_line.HasSwitch(switches::kLoginManager) &&
          !command_line.HasSwitch(switches::kForceLoginManagerInTests) &&
          app_manager->IsAutoLaunchEnabled() &&
          KioskAppLaunchError::Get() == KioskAppLaunchError::NONE;
 }
 
 }  // namespace
 
 // static
 scoped_ptr<session_manager::SessionManager>
 ChromeSessionManager::CreateSessionManager(
     const base::CommandLine& parsed_command_line,
     Profile* profile,
     bool is_running_test) {
   // Tests should be able to tune login manager before showing it. Thus only
   // show login UI (login and out-of-box) in normal (non-testing) mode with
   // --login-manager switch and if test passed --force-login-manager-in-tests.
   bool force_login_screen_in_test =
       parsed_command_line.HasSwitch(switches::kForceLoginManagerInTests);
 
-  const AccountId login_account_id(AccountId::FromUserEmail(
-      parsed_command_line.GetSwitchValueASCII(switches::kLoginUser)));
+  const std::string cryptohome_id =
+      parsed_command_line.GetSwitchValueASCII(switches::kLoginUser);
+  const AccountId login_account_id(cryptohome::GetAccountId(
+      cryptohome::Identification::FromString(cryptohome_id)));
 
   KioskAppManager::RemoveObsoleteCryptohomes();
 
   if (ShouldAutoLaunchKioskApp(parsed_command_line)) {
     VLOG(1) << "Starting Chrome with KioskAutoLauncherSessionManagerDelegate";
     return scoped_ptr<session_manager::SessionManager>(new ChromeSessionManager(
         new KioskAutoLauncherSessionManagerDelegate()));
   } else if (parsed_command_line.HasSwitch(switches::kLoginManager) &&
              (!is_running_test || force_login_screen_in_test)) {
     VLOG(1) << "Starting Chrome with LoginOobeSessionManagerDelegate";
@@ skipping 22 matching lines @@
 
 ChromeSessionManager::ChromeSessionManager(
     session_manager::SessionManagerDelegate* delegate) {
   Initialize(delegate);
 }
 
 ChromeSessionManager::~ChromeSessionManager() {
 }
 
 }  // namespace chromeos