Add ARC++ kiosk menu items and ability to start kiosk session.

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 70dd32e6201a25ed65e5c2b7cf0a8a1c1ffef9d1..1dd01faa05608f678a562f49473dab7654cab7e9 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -1294,7 +1294,8 @@ bool UserSessionManager::InitializeUserSession(Profile* profile) {
 
 void UserSessionManager::InitSessionRestoreStrategy() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  bool in_app_mode = chrome::IsRunningInForcedAppMode();
+  bool in_app_mode = chrome::IsRunningInForcedAppMode() ||
+                     chrome::IsRunningInForcedAndroidAppMode();
 
   // Are we in kiosk app mode?
   if (in_app_mode) {
@@ -1327,8 +1328,8 @@ void UserSessionManager::RestoreAuthSessionImpl(
     bool restore_from_auth_cookies) {
   CHECK((authenticator_.get() && authenticator_->authentication_context()) ||
         !restore_from_auth_cookies);
-
   if (chrome::IsRunningInForcedAppMode() ||
+      chrome::IsRunningInForcedAndroidAppMode() ||
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kDisableGaiaServices)) {
     return;