| Index: chrome/browser/chromeos/login/user_manager.cc
|
| diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc
|
| index 41685d57062f20baff958e109ba3bb3aac5b183f..f3057ae609e2778793f5bceac213327e3d17976d 100644
|
| --- a/chrome/browser/chromeos/login/user_manager.cc
|
| +++ b/chrome/browser/chromeos/login/user_manager.cc
|
| @@ -91,18 +91,15 @@ UserManager* UserManager::Get() {
|
| return g_user_manager;
|
| }
|
|
|
| -// static
|
| -bool UserManager::IsMultipleProfilesAllowed() {
|
| - return CommandLine::ForCurrentProcess()->HasSwitch(
|
| - ::switches::kMultiProfiles);
|
| -}
|
| -
|
| UserManager::~UserManager() {
|
| }
|
|
|
| // static
|
| UserManager* UserManager::SetForTesting(UserManager* user_manager) {
|
| UserManager* previous_user_manager = g_user_manager;
|
| + if (previous_user_manager)
|
| + previous_user_manager->Shutdown();
|
| +
|
| g_user_manager = user_manager;
|
| return previous_user_manager;
|
| }
|
|
|