| 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 3c52046689839bc63ea23097a1033da262fd039e..e4a0cb8f2f5f17d7e367184b8e37cf0cf74a2ebf 100644
|
| --- a/chrome/browser/chromeos/login/session/user_session_manager.cc
|
| +++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
|
| @@ -1117,10 +1117,11 @@ void UserSessionManager::UserProfileInitialized(Profile* profile,
|
| }
|
|
|
| if (user_context_.GetAuthFlow() == UserContext::AUTH_FLOW_ACTIVE_DIRECTORY) {
|
| + // Call FinalizePrepareProfile directly and skip RestoreAuthSessionImpl
|
| + // because there is no need to merge session for Active Directory users.
|
| base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(&UserSessionManager::CompleteProfileCreateAfterAuthTransfer,
|
| - AsWeakPtr(), profile));
|
| + FROM_HERE, base::Bind(&UserSessionManager::FinalizePrepareProfile,
|
| + AsWeakPtr(), profile));
|
| return;
|
| }
|
|
|
|
|