This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

 // Copyright 2013 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/app_mode/kiosk_app_manager.h"
 
 #include <map>
 #include <set>
 
 #include "base/barrier_closure.h"
@@ skipping 20 matching lines @@
 #include "chrome/browser/extensions/external_loader.h"
 #include "chrome/browser/extensions/external_provider_impl.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #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"
 
 namespace chromeos {
 
 namespace {
 
 // Domain that is used for kiosk-app account IDs.
 const char kKioskAppAccountDomain[] = "kiosk-apps";
@@ skipping 582 matching lines @@
       new_app->Load();
     }
     CancelDelayedCryptohomeRemoval(it->user_id);
   }
 
   base::Closure cryptohomes_barrier_closure;
 
   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_account_id = active_user->GetAccountId();
     for (const auto& it : old_apps) {
-      if (it.second->user_id() == active_user_id) {
+      if (it.second->user_id() == active_account_id.GetUserEmail()) {

[stevenjb, 2015/10/23 17:17:02]

Is GetUserEmail() just an accessor? If so, we should rename it user_mail() (in a
separate CL). If not, we should store it locally here instead of calling a
function for every app.

[Alexander Alekseev, 2015/10/23 23:21:22]

user_id must return AccountId (and it will shortly). So this is just a reminder,
that we need to drop GetUserEmail() here.

GetUserEmail() may stay as an accessor, or may become something complex. It has
specifically chosen name so that we could grep sources for it and find how many
files are still to be updated.

Actually, I expect GetUserEmail() to disappear at some moment.

[stevenjb, 2015/10/26 18:28:00]

So then, in case GetUserEmail doesn't get removed and ends up being something
non trivial, we should store it locally, i.e. 'std::string account_email =
active_account_id.GetUserEmail()'. But if we're definitely going to eliminate it
soon, I guess that is optional.

         VLOG(1) << "Currently running kiosk app removed from policy, exiting";
         cryptohomes_barrier_closure = BarrierClosure(
             old_apps.size(), base::Bind(&chrome::AttemptUserExit));
         break;
       }
     }
   }
 
   // Clears cache and deletes the remaining old data.
   std::vector<std::string> apps_to_remove;
@@ skipping 109 matching lines @@
   *cache_dir = user_data_dir.AppendASCII(kCrxCacheDir);
 }
 
 void KioskAppManager::GetCrxUnpackDir(base::FilePath* unpack_dir) {
   base::FilePath temp_dir;
   base::GetTempDir(&temp_dir);
   *unpack_dir = temp_dir.AppendASCII(kCrxUnpackDir);
 }
 
 }  // namespace chromeos