commit a9664b033a6a92f77d1036492f7b2f09f72dedf1
author Andrea Orru <andreaorru@chromium.org> Wed Apr 26 02:46:48 2023
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Apr 26 02:46:48 2023
tree 619ef80ae04f0ecc3c51268ea4cb31e41cc1028e
parent e4ee103854485f7c6bb264e17e6c684ba682d9a5

Revert "Move SessionManager::RemoveObserver to OnSessionStateChanged"

This reverts commit 60cb8263e83eab2954bf2fed4fcafd3e3381790b.

Reason for revert: b/279155522 (conflicts with Kiosk)

Original change's description:
> Move SessionManager::RemoveObserver to OnSessionStateChanged
>
> This change moves the call to RemoveObserver from
> InitializeAndStartIfNeeded to OnSessionStateChanged.
>
> This prevents InitializeAndStartIfNeeded from being called multiple
> times, even if Lacros's state is UNAVAILABLE.
>
> Change-Id: I91594a009e2047d2264c2d44a9a6ad0fc1afdf0a
> Bug: 1363933
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4422091
> Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
> Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com>
> Commit-Queue: Andrea Orru <andreaorru@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1131601}

Bug: 1363933
Change-Id: I5535b538522fab73a13f943289caa864975ef406
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4478590
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Andrea Orru <andreaorru@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1135696}

chrome/browser/ash/crosapi/browser_manager.cc

diff --git a/chrome/browser/ash/crosapi/browser_manager.cc b/chrome/browser/ash/crosapi/browser_manager.cc
index 522c1451..fe350d6 100644
--- a/chrome/browser/ash/crosapi/browser_manager.cc
+++ b/chrome/browser/ash/crosapi/browser_manager.cc
@@ -739,6 +739,9 @@
   }
   DCHECK_EQ(state_, State::NOT_INITIALIZED);
 
+  // Ensure this isn't run multiple times.
+  session_manager::SessionManager::Get()->RemoveObserver(this);
+
   PrepareLacrosPolicies();
 
   // Perform the UMA recording for the current Lacros mode of operation.
@@ -1377,9 +1380,6 @@
     return;
   }
 
-  // Ensure this isn't run multiple times.
-  session_manager::SessionManager::Get()->RemoveObserver(this);
-
   if (launch_at_login_screen_ && postlogin_pipe_fd_.is_valid()) {
     // Resume Lacros launch after login, if it was pre-launched.
     ResumeLaunch();