kiosk: Fix kiosk session restart

components/user_manager/user_manager_base.h

 // 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.
 
 #ifndef COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_
 #define COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 136 matching lines @@
   virtual void EnsureUsersLoaded();
 
   // Handle OAuth token |status| change for |account_id|.
   virtual void HandleUserOAuthTokenStatusChange(
       const AccountId& account_id,
       User::OAuthTokenStatus status) const = 0;
 
   // Returns true if device is enterprise managed.
   virtual bool IsEnterpriseManaged() const = 0;
 
-  // Helper function that copies users from |users_list| to |users_vector| and
-  // |users_set|. Duplicates and users already present in |existing_users| are
-  // skipped.
-  // Loads public accounts from the Local state and fills in
-  // |public_sessions_set|.
-  virtual void LoadPublicAccounts(std::set<AccountId>* public_sessions_set) = 0;
+  // Loads device local accounts from the Local state and fills in
+  // |device_local_accounts_set|.
+  virtual void LoadDeviceLocalAccounts(
+      std::set<AccountId>* device_local_accounts_set) = 0;
 
   // Notifies that user has logged in.
   virtual void NotifyOnLogin();
 
   // Notifies observers that another user was added to the session.
   // If |user_switch_pending| is true this means that user has not been fully
   // initialized yet like waiting for profile to be loaded.
   virtual void NotifyUserAddedToSession(const User* added_user,
                                         bool user_switch_pending);
 
@@ skipping 27 matching lines @@
 
   // Removes data stored or cached outside the user's cryptohome (wallpaper,
   // avatar, OAuth token status, display name, display email).
   virtual void RemoveNonCryptohomeData(const AccountId& account_id);
 
   // Check for a particular user type.
 
   // Returns true if |account_id| represents demo app.
   virtual bool IsDemoApp(const AccountId& account_id) const = 0;
 
-  // Returns true if |account_id| represents kiosk app.
-  virtual bool IsKioskApp(const AccountId& account_id) const = 0;
-
-  // Returns true if |account_id| represents public account that has been marked
-  // for deletion.
-  virtual bool IsPublicAccountMarkedForRemoval(
+  // Returns true if |account_id| represents a device local account that has
+  // been marked for deletion.
+  virtual bool IsDeviceLocalAccountMarkedForRemoval(
       const AccountId& account_id) const = 0;
 
   // These methods are called when corresponding user type has signed in.
 
   // Indicates that the demo account has just logged in.
   virtual void DemoAccountLoggedIn() = 0;
 
   // Indicates that a user just logged in as guest.
   virtual void GuestUserLoggedIn();
 
   // Indicates that a kiosk app robot just logged in.
-  virtual void KioskAppLoggedIn(const AccountId& kiosk_app_account_id) = 0;
+  virtual void KioskAppLoggedIn(User* user) = 0;
 
   // Indicates that a user just logged into a public session.
   virtual void PublicAccountUserLoggedIn(User* user) = 0;
 
   // Indicates that a regular user just logged in.
   virtual void RegularUserLoggedIn(const AccountId& account_id);
 
   // Indicates that a regular user just logged in as ephemeral.
   virtual void RegularUserLoggedInAsEphemeral(const AccountId& account_id);
 
@@ skipping 24 matching lines @@
   // NULL until a user has logged in, then points to one
   // of the User instances in |users_|, the |guest_user_| instance or an
   // ephemeral user instance.
   User* active_user_ = nullptr;
 
   // The primary user of the current session. It is recorded for the first
   // signed-in user and does not change thereafter.
   User* primary_user_ = nullptr;
 
   // List of all known users. User instances are owned by |this|. Regular users
-  // are removed by |RemoveUserFromList|, public accounts by
-  // |UpdateAndCleanUpPublicAccounts|.
+  // are removed by |RemoveUserFromList|, device local accounts by
+  // |UpdateAndCleanUpDeviceLocalAccounts|.
   UserList users_;
 
   // List of all users that are logged in current session. These point to User
   // instances in |users_|. Only one of them could be marked as active.
   UserList logged_in_users_;
 
   // A list of all users that are logged in the current session. In contrast to
   // |logged_in_users|, the order of this list is least recently used so that
   // the active user should always be the first one in the list.
   UserList lru_logged_in_users_;
@@ skipping 105 matching lines @@
   scoped_refptr<base::TaskRunner> task_runner_;
 
   base::WeakPtrFactory<UserManagerBase> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerBase);
 };
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_