chrome/browser/chromeos/login/session/user_session_manager.cc - Issue 2145813002: Clear old ARC instance before opt-in.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/session/user_session_manager.cc

Issue 2145813002: Clear old ARC instance before opt-in. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed test Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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 4a7f9fccd00462e7c0bee7f2cf7dc2791cb44198..64ac9327679e83a455b347646b9ac5bd4afaa6d0 100644

--- a/chrome/browser/chromeos/login/session/user_session_manager.cc

+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc

@@ -1166,7 +1166,7 @@ void UserSessionManager::FinalizePrepareProfile(Profile* profile) {

arc_enabled_pref->Init(prefs::kArcEnabled, profile->GetPrefs());

DCHECK(arc::ArcServiceManager::Get());

arc::ArcServiceManager::Get()->OnPrimaryUserProfilePrepared(

- account_id, std::move(arc_enabled_pref));

+ account_id, std::move(arc_enabled_pref), profile->GetPrefs());

arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get();

DCHECK(arc_auth_service);

arc_auth_service->OnPrimaryUserProfilePrepared(profile);