| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| index 8c78bce1323821acb9ed4989c971e83404be29f6..54d3b38bf3a8c7d285a1f5c7208a03add6151ea0 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -872,10 +872,13 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
|
|
|
| chrome::CloseAsh();
|
|
|
| - // Destroy the UserManager after ash has been destroyed.
|
| - UserManager::Destroy();
|
| -
|
| ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
|
| +
|
| + // Destroy the UserManager after ash has been destroyed and
|
| + // ChromeBrowserMainPartsLinux::PostMainMessageLoopRun run. The latter might
|
| + // trigger MergeSessionThrottle::ShouldShowMergeSessionPage, which requires
|
| + // the UserManager to exist.
|
| + UserManager::Destroy();
|
| }
|
|
|
| void ChromeBrowserMainPartsChromeos::PostDestroyThreads() {
|
|
|