diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 14:25:13 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 14:25:13 +0000 |
| commit | 559a9bd2ab0d32b79e1c938159d952b1b329b7ee (patch) | |
| tree | 45f2918c772080e15543dac9c01f7b30d55cbfb1 | |
| parent | 8d2928dde64d46e7613314955d02eb24d52f7dee (diff) | |
| download | chromium_src-559a9bd2ab0d32b79e1c938159d952b1b329b7ee.zip chromium_src-559a9bd2ab0d32b79e1c938159d952b1b329b7ee.tar.gz chromium_src-559a9bd2ab0d32b79e1c938159d952b1b329b7ee.tar.bz2 | |
Fix memory leak in MigrateBrowserPrefs caused by excessive copying.
BUG=71753
TEST=memory tests are green again
Review URL: http://codereview.chromium.org/6286079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74283 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 2 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions_mac.txt | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index a3a498f..ba65eb9 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -178,7 +178,7 @@ void MigrateBrowserPrefs(PrefService* user_prefs, PrefService* local_state) { if (local_state->HasPrefPath(prefs::kBrowserWindowPlacement)) { user_prefs->Set(prefs::kBrowserWindowPlacement, *(local_state->FindPreference(prefs::kBrowserWindowPlacement)-> - GetValue()->DeepCopy())); + GetValue())); } local_state->ClearPref(prefs::kBrowserWindowPlacement); diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt index 93c3792..b14e60a 100644 --- a/tools/valgrind/memcheck/suppressions_mac.txt +++ b/tools/valgrind/memcheck/suppressions_mac.txt @@ -1332,18 +1332,3 @@ fun:_ZN12_GLOBAL__N_131MenuButtonTest_OpenOnClick_Test8TestBodyEv fun:_ZN7testingL35HandleExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS3_FS2_vEPKc } -{ - bug_71753 - Memcheck:Leak - fun:_Znw* - fun:_ZNK15DictionaryValue8DeepCopyEv - fun:_ZN7browser19MigrateBrowserPrefsEP11PrefServiceS1_ - fun:_ZN11ProfileImpl8GetPrefsEv - fun:_ZN11ProfileImplC2ERK8FilePath - fun:_ZN11ProfileImplC1ERK8FilePath - fun:_ZN7Profile13CreateProfileERK8FilePath - fun:_ZN14ProfileManager13CreateProfileERK8FilePath - fun:_ZN14ProfileManager10GetProfileERK8FilePathb - fun:_ZN14ProfileManager10GetProfileERK8FilePath - fun:_ZN14ProfileManager17GetDefaultProfileERK8FilePath -} |