kiosk: Fix kiosk session restart

components/user_manager/user_manager_base.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 "components/user_manager/user_manager_base.h"
 
 #include <stddef.h>
 #include <set>
 #include <utility>
 
@@ skipping 134 matching lines @@
 
     // Reset the new user flag if the user already exists.
     SetIsCurrentUserNew(false);
     NotifyUserAddedToSession(user, true /* user switch pending */);
 
     return;
   }
 
   if (IsGuestAccountId(account_id)) {
     GuestUserLoggedIn();
-  } else if (IsKioskApp(account_id)) {
-    KioskAppLoggedIn(account_id);
   } else if (IsDemoApp(account_id)) {
     DemoAccountLoggedIn();
   } else {
     EnsureUsersLoaded();
 
     if (user && user->GetType() == USER_TYPE_PUBLIC_ACCOUNT) {
       PublicAccountUserLoggedIn(user);
+    } else if (user && user->GetType() == USER_TYPE_KIOSK_APP) {
+      KioskAppLoggedIn(user);
     } else if ((user && user->GetType() == USER_TYPE_SUPERVISED) ||
                (!user && IsSupervisedAccountId(account_id))) {
       SupervisedUserLoggedIn(account_id);
-    } else if (browser_restart && IsPublicAccountMarkedForRemoval(account_id)) {
+    } else if (browser_restart &&
+               IsDeviceLocalAccountMarkedForRemoval(account_id)) {
       PublicAccountUserLoggedIn(User::CreatePublicAccountUser(account_id));
     } else if (account_id != GetOwnerAccountId() && !user &&
                (AreEphemeralUsersEnabled() || browser_restart)) {
       RegularUserLoggedInAsEphemeral(account_id);
     } else {
       RegularUserLoggedIn(account_id);
     }
   }
 
   DCHECK(active_user_);
@@ skipping 410 matching lines @@
   return session_started_;
 }
 
 bool UserManagerBase::IsUserNonCryptohomeDataEphemeral(
     const AccountId& account_id) const {
   // Data belonging to the guest and stub users is always ephemeral.
   if (IsGuestAccountId(account_id) || IsStubAccountId(account_id))
     return true;
 
   // Data belonging to the owner, anyone found on the user list and obsolete
-  // public accounts whose data has not been removed yet is not ephemeral.
+  // device local accounts whose data has not been removed yet is not ephemeral.
   if (account_id == GetOwnerAccountId() || UserExistsInList(account_id) ||
-      IsPublicAccountMarkedForRemoval(account_id)) {
+      IsDeviceLocalAccountMarkedForRemoval(account_id)) {
     return false;
   }
 
   // Data belonging to the currently logged-in user is ephemeral when:
   // a) The user logged into a regular gaia account while the ephemeral users
   //    policy was enabled.
   //    - or -
   // b) The user logged into any other account type.
   if (IsUserLoggedIn() && (account_id == GetLoggedInUser()->GetAccountId()) &&
       (is_current_user_ephemeral_regular_user_ ||
@@ skipping 108 matching lines @@
   const base::DictionaryValue* prefs_display_names =
       local_state->GetDictionary(kUserDisplayName);
   const base::DictionaryValue* prefs_given_names =
       local_state->GetDictionary(kUserGivenName);
   const base::DictionaryValue* prefs_display_emails =
       local_state->GetDictionary(kUserDisplayEmail);
   const base::DictionaryValue* prefs_user_types =
       local_state->GetDictionary(kUserType);
 
   // Load public sessions first.
-  std::set<AccountId> public_sessions_set;
-  LoadPublicAccounts(&public_sessions_set);
+  std::set<AccountId> device_local_accounts_set;
+  LoadDeviceLocalAccounts(&device_local_accounts_set);
 
   // Load regular users and supervised users.
   std::vector<AccountId> regular_users;
   std::set<AccountId> regular_users_set;
-  ParseUserList(*prefs_regular_users,
-                public_sessions_set,
-                &regular_users,
+  ParseUserList(*prefs_regular_users, device_local_accounts_set, &regular_users,
                 &regular_users_set);
   for (std::vector<AccountId>::const_iterator it = regular_users.begin();
        it != regular_users.end(); ++it) {
     User* user = nullptr;
     if (IsSupervisedAccountId(*it)) {
       user = User::CreateSupervisedUser(*it);
     } else {
       user = User::CreateRegularUser(*it);
       int user_type;
       if (prefs_user_types->GetIntegerWithoutPathExpansion(it->GetUserEmail(),
@@ skipping 296 matching lines @@
 }
 
 void UserManagerBase::DeleteUser(User* user) {
   const bool is_active_user = (user == active_user_);
   delete user;
   if (is_active_user)
     active_user_ = nullptr;
 }
 
 }  // namespace user_manager