Clean ash from unnessesary LoginStatus::ARC_KIOSK_APP

This one just created some code duplication of LoginStatus::KIOSK_APP

Bug: 1015383
Change-Id: Id03e4813199dd38b29ca46845182b7f82b04382c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1864799
Commit-Queue: Anatoliy Potapchuk <apotapchuk@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706937}

ash/login_status.h

@@ -14,8 +14,7 @@ enum class LoginStatus {
   GUEST,          // A guest is logged in (i.e. incognito)
   PUBLIC,         // A public account is logged in
   SUPERVISED,     // A supervised user is logged in
-  KIOSK_APP,      // Is in kiosk app mode
-  ARC_KIOSK_APP   // Is in ARC kiosk mode
+  KIOSK_APP       // In kiosk mode for Chrome app, ARC, or PWA.
 };
 
 }  // namespace ash

ash/metrics/user_metrics_recorder.cc

@@ -87,12 +87,6 @@ bool IsKioskModeActive() {
          LoginStatus::KIOSK_APP;
 }
 
-// Returns true if ARC kiosk mode is active.
-bool IsArcKioskModeActive() {
-  return Shell::Get()->session_controller()->login_status() ==
-         LoginStatus::ARC_KIOSK_APP;
-}
-
 // Returns true if there is an active user and their session isn't currently
 // locked.
 bool IsUserActive() {
@@ -495,7 +489,7 @@ void UserMetricsRecorder::RecordPeriodicMetrics() {
 }
 
 bool UserMetricsRecorder::IsUserInActiveDesktopEnvironment() const {
-  return IsUserActive() && !IsKioskModeActive() && !IsArcKioskModeActive();
+  return IsUserActive() && !IsKioskModeActive();
 }
 
 void UserMetricsRecorder::StartTimer() {

ash/session/session_controller_impl.cc

@@ -566,7 +566,7 @@ LoginStatus SessionControllerImpl::CalculateLoginStatusForActiveSession()
     case user_manager::USER_TYPE_CHILD:
       return LoginStatus::SUPERVISED;
     case user_manager::USER_TYPE_ARC_KIOSK_APP:
-      return LoginStatus::ARC_KIOSK_APP;
+      return LoginStatus::KIOSK_APP;
     case user_manager::USER_TYPE_ACTIVE_DIRECTORY:
       // TODO: There is no LoginStatus for this.
       return LoginStatus::USER;

ash/session/session_controller_impl_unittest.cc

@@ -293,7 +293,7 @@ TEST_F(SessionControllerImplTest, GetLoginStateForActiveSession) {
       {user_manager::USER_TYPE_SUPERVISED, LoginStatus::SUPERVISED},
       {user_manager::USER_TYPE_KIOSK_APP, LoginStatus::KIOSK_APP},
       {user_manager::USER_TYPE_CHILD, LoginStatus::SUPERVISED},
-      {user_manager::USER_TYPE_ARC_KIOSK_APP, LoginStatus::ARC_KIOSK_APP},
+      {user_manager::USER_TYPE_ARC_KIOSK_APP, LoginStatus::KIOSK_APP},
       // TODO: Add USER_TYPE_ACTIVE_DIRECTORY if we add a status for it.
   };
 

ash/system/message_center/arc_notification_manager_delegate_impl.cc

@@ -24,8 +24,7 @@ bool ArcNotificationManagerDelegateImpl::IsPublicSessionOrKiosk() const {
       Shell::Get()->session_controller()->login_status();
 
   return login_status == LoginStatus::PUBLIC ||
-         login_status == LoginStatus::KIOSK_APP ||
-         login_status == LoginStatus::ARC_KIOSK_APP;
+         login_status == LoginStatus::KIOSK_APP;
 }
 
 void ArcNotificationManagerDelegateImpl::ShowMessageCenter() {