Followup for Enable CRD for ARC Kiosks

Bug: 885086
Change-Id: I1eb764626437c07008a0f44d4a7b0f47b05f931a
Reviewed-on: https://chromium-review.googlesource.com/1232093Reviewed-by: Sergey Poromov <poromov@chromium.org>
Commit-Queue: Sergey Poromov <poromov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592164}

chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc

@@ -148,7 +148,6 @@ bool CRDHostDelegate::AreServicesReady() const {
 
 bool CRDHostDelegate::IsRunningKiosk() const {
   auto* user_manager = user_manager::UserManager::Get();
-  // TODO(antrim): find out if Arc Kiosk is also eligible.
   if (!user_manager->IsLoggedInAsKioskApp() &&
       !user_manager->IsLoggedInAsArcKioskApp()) {
     return false;
@@ -164,10 +163,8 @@ bool CRDHostDelegate::IsRunningKiosk() const {
     CHECK(manager->GetApp(manager->GetAutoLaunchApp(), &app));
     return app.was_auto_launched_with_zero_delay;
   } else {  // ARC Kiosk
-    chromeos::ArcKioskAppManager* manager = chromeos::ArcKioskAppManager::Get();
-    if (!manager->GetAutoLaunchAccountId().is_valid())
-      return false;
-    return manager->current_app_was_auto_launched_with_zero_delay();
+    return chromeos::ArcKioskAppManager::Get()
+        ->current_app_was_auto_launched_with_zero_delay();
   }
 }
 

chrome/browser/chromeos/policy/remote_commands/device_command_start_crd_session_job.h

@@ -64,7 +64,7 @@ class DeviceCommandStartCRDSessionJob : public RemoteCommandJob {
     // Check if required system services are ready.
     virtual bool AreServicesReady() const = 0;
 
-    // Check if device is running in Kiosk mode.
+    // Check if device is running an auto-launched Kiosk.
     virtual bool IsRunningKiosk() const = 0;
 
     // Return current user idleness period.