Merge "kiosk: Allow startup flags for kiosk sessions"

chrome/browser/chromeos/login/session/user_session_manager.cc

Index: chrome/browser/chromeos/login/session/user_session_manager.cc
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
index 9977aef8173de84e07483bf780865473dcd2e787..ca48465d52bdca6777798170777b374ccba359c8 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -694,6 +694,12 @@ bool UserSessionManager::RestartToApplyPerSessionFlagsIfNeed(
   if (ProfileHelper::IsSigninProfile(profile))
     return false;
 
+  // Kiosk sessions keeps the startup flags.
+  if (user_manager::UserManager::Get() &&
+      user_manager::UserManager::Get()->IsLoggedInAsKioskApp()) {
+    return false;
+  }
+
   if (early_restart && !CanPerformEarlyRestart())
     return false;