| 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 0a145993d8c347da68a2f27d5198852ce6fd6ee2..d3466c4521eb339163f9e3ab3bb4007228dca7b1 100644
|
| --- a/chrome/browser/chromeos/login/session/user_session_manager.cc
|
| +++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
|
| @@ -1143,8 +1143,8 @@ void UserSessionManager::FinalizePrepareProfile(Profile* profile) {
|
| if (arc::ArcBridgeService::GetEnabled(
|
| base::CommandLine::ForCurrentProcess())) {
|
| DCHECK(arc::ArcServiceManager::Get());
|
| - arc::ArcServiceManager::Get()->OnPrimaryUserProfilePrepared(
|
| - multi_user_util::GetAccountIdFromProfile(profile));
|
| + arc::ArcServiceManager::Get()->SetProfileAndAccountId(
|
| + profile, multi_user_util::GetAccountIdFromProfile(profile));
|
| }
|
| }
|
|
|
| @@ -1785,6 +1785,12 @@ bool UserSessionManager::TokenHandlesEnabled() {
|
| }
|
|
|
| void UserSessionManager::Shutdown() {
|
| + if (arc::ArcBridgeService::GetEnabled(
|
| + base::CommandLine::ForCurrentProcess())) {
|
| + DCHECK(arc::ArcServiceManager::Get());
|
| + arc::ArcServiceManager::Get()->SetProfileAndAccountId(nullptr,
|
| + EmptyAccountId());
|
| + }
|
| token_handle_fetcher_.reset();
|
| token_handle_util_.reset();
|
| first_run::GoodiesDisplayer::Delete();
|
|
|