Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: chrome/browser/chromeos/settings/cros_settings.cc

Issue 14225019: Delete old user manager in ~ScopedTestCrosSettings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert suppressions Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/heapcheck/suppressions.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/settings/cros_settings.cc
diff --git a/chrome/browser/chromeos/settings/cros_settings.cc b/chrome/browser/chromeos/settings/cros_settings.cc
index 2e7e3565e774809510b39491c84fa70b97358c41..10c7ddf74052ea04739bddbd6f4e11c8053062b3 100644
--- a/chrome/browser/chromeos/settings/cros_settings.cc
+++ b/chrome/browser/chromeos/settings/cros_settings.cc
@@ -340,7 +340,8 @@ ScopedTestCrosSettings::ScopedTestCrosSettings()
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();
« no previous file with comments | « no previous file | tools/heapcheck/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698