Revert 170507 - Add public accounts to UserManager

chrome/browser/chromeos/login/user_manager_unittest.cc

Index: chrome/browser/chromeos/login/user_manager_unittest.cc
===================================================================
--- chrome/browser/chromeos/login/user_manager_unittest.cc	(revision 170577)
+++ chrome/browser/chromeos/login/user_manager_unittest.cc	(working copy)
@@ -17,7 +17,6 @@
 #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"
@@ -81,14 +80,6 @@
     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 {
@@ -112,8 +103,6 @@
   }
 
   void ResetUserManager() {
-    if (user_manager_impl)
-      user_manager_impl->Shutdown();
     user_manager_impl.reset(new UserManagerImpl());
     UserManager::Set(user_manager_impl.get());
   }