Simplify some kiosk checks to avoid duplication

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

chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

@@ -642,8 +642,7 @@ void ChromeUserManagerImpl::Observe(
     const content::NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED);
   Profile* profile = content::Details<Profile>(details).ptr();
-  if (IsUserLoggedIn() && !IsLoggedInAsGuest() && !IsLoggedInAsKioskApp() &&
-      !IsLoggedInAsArcKioskApp()) {
+  if (IsUserLoggedIn() && !IsLoggedInAsGuest() && !IsLoggedInAsAnyKioskApp()) {
     if (!profile->IsOffTheRecord()) {
       if (AuthSyncObserver::ShouldObserve(profile)) {
         AuthSyncObserver* sync_observer =

chrome/browser/chromeos/login/users/mock_user_manager.cc

@@ -66,6 +66,10 @@ const user_manager::User* MockUserManager::GetPrimaryUser() const {
   return GetActiveUser();
 }
 
+bool MockUserManager::IsLoggedInAsAnyKioskApp() const {
+  return IsLoggedInAsKioskApp() || IsLoggedInAsArcKioskApp();
+}
+
 MultiProfileUserController* MockUserManager::GetMultiProfileUserController() {
   return nullptr;
 }

chrome/browser/chromeos/login/users/mock_user_manager.h

@@ -131,6 +131,9 @@ class MockUserManager : public ChromeUserManager {
   user_manager::User* GetActiveUser() override;
   const user_manager::User* GetPrimaryUser() const override;
 
+  // We can't mock it as easily.
+  bool IsLoggedInAsAnyKioskApp() const override;
+
   // ChromeUserManager overrides:
   MultiProfileUserController* GetMultiProfileUserController() override;
   UserImageManager* GetUserImageManager(const AccountId& account_id) override;

chrome/browser/chromeos/system/automatic_reboot_manager.cc

@@ -396,8 +396,7 @@ void AutomaticRebootManager::MaybeReboot(bool ignore_session) {
 void AutomaticRebootManager::Reboot() {
   // If a non-kiosk-app session is in progress, do not reboot.
   if (user_manager::UserManager::Get()->IsUserLoggedIn() &&
-      !user_manager::UserManager::Get()->IsLoggedInAsKioskApp() &&
-      !user_manager::UserManager::Get()->IsLoggedInAsArcKioskApp()) {
+      !user_manager::UserManager::Get()->IsLoggedInAsAnyKioskApp()) {
     VLOG(1) << "Skipping reboot because non-kiosk session is active";
     return;
   }

chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.cc

@@ -51,9 +51,7 @@ CertificateManagerDialogUI::CertificateManagerDialogUI(content::WebUI* web_ui)
       user_manager::UserManager::Get()->IsLoggedInAsGuest() ||
           user_manager::UserManager::Get()->IsLoggedInAsPublicAccount());
   source->AddBoolean(
-      "isKiosk",
-      user_manager::UserManager::Get()->IsLoggedInAsKioskApp() ||
-          user_manager::UserManager::Get()->IsLoggedInAsArcKioskApp());
+      "isKiosk", user_manager::UserManager::Get()->IsLoggedInAsAnyKioskApp());
 
   source->UseStringsJs();
   source->SetDefaultResource(IDR_CERT_MANAGER_DIALOG_HTML);