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

chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc

Index: chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc
index e5f452cd129b6a91b67ec5976d3c8e8ab78e87b5..5c9c45d597d75813fa060f3da410ae6039fc256b 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc
+++ b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc
@@ -49,14 +49,14 @@ DemoAppLauncher::~DemoAppLauncher() {
 void DemoAppLauncher::StartDemoAppLaunch() {
   DVLOG(1) << "Launching demo app...";
   // user_id = DemoAppUserId, force_emphemeral = true, delegate = this.
-  kiosk_profile_loader_.reset(new KioskProfileLoader(
-      login::DemoAccountId().GetUserEmail(), true, this));
+  kiosk_profile_loader_.reset(
+      new KioskProfileLoader(login::DemoAccountId(), true, this));
   kiosk_profile_loader_->Start();
 }
 
 // static
-bool DemoAppLauncher::IsDemoAppSession(const std::string& user_id) {
-  return user_id == login::DemoAccountId().GetUserEmail();
+bool DemoAppLauncher::IsDemoAppSession(const AccountId& account_id) {
+  return account_id == login::DemoAccountId();
 }
 
 // static