This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

Index: chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
index bb339fe9a7b6015f39417022a44d6b82e3cad454..1033995d2330bdbf738e2c3af45c58bd5833afb8 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
@@ -38,6 +38,7 @@
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "components/ownership/owner_key_util.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/common/extension_urls.h"
@@ -640,9 +641,9 @@ void KioskAppManager::UpdateAppData() {
   const user_manager::User* active_user =
       user_manager::UserManager::Get()->GetActiveUser();
   if (active_user) {
-    std::string active_user_id = active_user->GetUserID();
+    const AccountId active_user_id = active_user->GetUserID();

[achuithb, 2015/10/23 00:08:49]

active_account_id

[Alexander Alekseev, 2015/10/23 09:11:21]

Done.

     for (const auto& it : old_apps) {
-      if (it.second->user_id() == active_user_id) {
+      if (it.second->user_id() == active_user_id.GetUserEmail()) {
         VLOG(1) << "Currently running kiosk app removed from policy, exiting";
         cryptohomes_barrier_closure = BarrierClosure(
             old_apps.size(), base::Bind(&chrome::AttemptUserExit));