Add public accounts to UserManager

chrome/browser/chromeos/login/user_manager_unittest.cc

Index: chrome/browser/chromeos/login/user_manager_unittest.cc
diff --git a/chrome/browser/chromeos/login/user_manager_unittest.cc b/chrome/browser/chromeos/login/user_manager_unittest.cc
index 8d8f5e01718252fd48f0ce187121ea3d12f314ff..470321a915f9d6fb6aa576832f778b3e0720ec36 100644
--- a/chrome/browser/chromeos/login/user_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/user_manager_unittest.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/chromeos/settings/cros_settings_provider.h"
+#include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/test/base/testing_browser_process.h"
@@ -80,6 +81,14 @@ class UserManagerTest : public testing::Test {
     cros_settings_->AddSettingsProvider(device_settings_provider_);
 
     UserManager::Set(old_user_manager_);
+
+    // Shut down the DeviceSettingsService.
+    DeviceSettingsService::Get()->Shutdown();
+
+    // Shut down the remaining UserManager instances.
+    if (user_manager_impl)
+      user_manager_impl->Shutdown();
+    UserManager::Get()->Shutdown();
   }
 
   bool GetUserManagerEphemeralUsersEnabled() const {
@@ -103,6 +112,8 @@ class UserManagerTest : public testing::Test {
   }
 
   void ResetUserManager() {
+    if (user_manager_impl)
+      user_manager_impl->Shutdown();
     user_manager_impl.reset(new UserManagerImpl());
     UserManager::Set(user_manager_impl.get());
   }