Delete old user manager in ~ScopedTestCrosSettings

chrome/browser/chromeos/settings/cros_settings.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 322 matching lines @@
     : initialized_device_settings_service_(false) {
   if (!DeviceSettingsService::IsInitialized()) {
     DeviceSettingsService::Initialize();
     initialized_device_settings_service_ = true;
   }
   CrosSettings::Initialize();
 }
 
 ScopedTestCrosSettings::~ScopedTestCrosSettings() {
   // UserManager holds a CrosSettings*, so ensure that it is destroyed.
-  UserManager::Set(NULL);
+  UserManager* old_manager = UserManager::Set(NULL);
+  delete old_manager;
   CrosSettings::Shutdown();
   if (initialized_device_settings_service_)
     DeviceSettingsService::Shutdown();
 }
 
 }  // namespace chromeos