kiosk: Fix kiosk session restart

components/user_manager/user.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.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 61 matching lines @@
 class DeviceLocalAccountUserBase : public User {
  public:
   // User:
   bool IsAffiliated() const override;
 
  protected:
   explicit DeviceLocalAccountUserBase(const AccountId& account_id);
   ~DeviceLocalAccountUserBase() override;
   // User:
   void SetAffiliation(bool) override;
+  bool IsDeviceLocalAccountUser() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountUserBase);
 };
 
 class KioskAppUser : public DeviceLocalAccountUserBase {
  public:
   explicit KioskAppUser(const AccountId& kiosk_app_account_id);
   ~KioskAppUser() override;
 
@@ skipping 22 matching lines @@
   explicit PublicAccountUser(const AccountId& account_id);
   ~PublicAccountUser() override;
 
   // Overridden from User:
   UserType GetType() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PublicAccountUser);
 };
 
+User::User(const AccountId& account_id)
+    : account_id_(account_id), user_image_(new UserImage) {}
+
+User::~User() {}
+
 std::string User::GetEmail() const {
   return display_email();
 }
 
 base::string16 User::GetDisplayName() const {
   // Fallback to the email account name in case display name haven't been set.
   return display_name_.empty() ? base::UTF8ToUTF16(GetAccountName(true))
                                : display_name_;
 }
 
@@ skipping 63 matching lines @@
 }
 
 bool User::IsAffiliated() const {
   return is_affiliated_;
 }
 
 void User::SetAffiliation(bool is_affiliated) {
   is_affiliated_ = is_affiliated;
 }
 
+bool User::IsDeviceLocalAccountUser() const {
+  return false;
+}
+
 User* User::CreateRegularUser(const AccountId& account_id) {
   return new RegularUser(account_id);
 }
 
 User* User::CreateGuestUser(const AccountId& guest_account_id) {
   return new GuestUser(guest_account_id);
 }
 
 User* User::CreateKioskAppUser(const AccountId& kiosk_app_account_id) {
   return new KioskAppUser(kiosk_app_account_id);
 }
 
 User* User::CreateSupervisedUser(const AccountId& account_id) {
   return new SupervisedUser(account_id);
 }
 
 User* User::CreatePublicAccountUser(const AccountId& account_id) {
   return new PublicAccountUser(account_id);
 }
 
-User::User(const AccountId& account_id) : account_id_(account_id),
-                                          user_image_(new UserImage) {}
-
-User::~User() {
-}
-
 void User::SetAccountLocale(const std::string& resolved_account_locale) {
   account_locale_.reset(new std::string(resolved_account_locale));
 }
 
 void User::SetImage(scoped_ptr<UserImage> user_image, int image_index) {
   user_image_ = std::move(user_image);
   image_index_ = image_index;
   image_is_stub_ = false;
   image_is_loading_ = false;
   DCHECK(HasDefaultImage() || user_image_->has_image_bytes());
@@ skipping 56 matching lines @@
 bool DeviceLocalAccountUserBase::IsAffiliated() const {
   return true;
 }
 
 void DeviceLocalAccountUserBase::SetAffiliation(bool) {
   // Device local accounts are always affiliated. No affiliation modification
   // must happen.
   NOTREACHED();
 }
 
+bool DeviceLocalAccountUserBase::IsDeviceLocalAccountUser() const {
+  return true;
+}
+
 KioskAppUser::KioskAppUser(const AccountId& kiosk_app_account_id)
     : DeviceLocalAccountUserBase(kiosk_app_account_id) {
   set_display_email(kiosk_app_account_id.GetUserEmail());
 }
 
 KioskAppUser::~KioskAppUser() {
 }
 
 UserType KioskAppUser::GetType() const {
   return user_manager::USER_TYPE_KIOSK_APP;
@@ skipping 36 matching lines @@
     case user_manager::USER_TYPE_SUPERVISED:
     case user_manager::USER_TYPE_KIOSK_APP:
       return false;
     default:
       NOTREACHED();
   }
   return false;
 }
 
 }  // namespace user_manager