summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-22 14:13:50 +0000
committermarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-22 14:13:50 +0000
commite90d4968649e52aebd4b4bd9b78b3506f90e2541 (patch)
treec3aac1d04a60f6578093b6fec1e8c6c5f84fc27e
parentb8d85bcc99bf93261fbd3343864cf799e676de4e (diff)
downloadchromium_src-e90d4968649e52aebd4b4bd9b78b3506f90e2541.zip
chromium_src-e90d4968649e52aebd4b4bd9b78b3506f90e2541.tar.gz
chromium_src-e90d4968649e52aebd4b4bd9b78b3506f90e2541.tar.bz2
Fix memory leak in PrefProviderTest.MigrateSinglePatternSettings and remove suppression.
BUG=86468 TEST=valgrind Review URL: http://codereview.chromium.org/7218007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90024 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/content_settings/content_settings_pref_provider_unittest.cc2
-rw-r--r--tools/valgrind/memcheck/suppressions.txt7
2 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
index d398002..5383df0 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
@@ -346,7 +346,7 @@ TEST_F(PrefProviderTest, MigrateSinglePatternSettings) {
ContentSettingsPattern pattern =
ContentSettingsPattern::FromString("http://www.example.com");
- DictionaryValue* all_settings_dictionary = new DictionaryValue();
+ scoped_ptr<DictionaryValue> all_settings_dictionary(new DictionaryValue());
all_settings_dictionary->SetWithoutPathExpansion(
pattern.ToString(), settings_dictionary);
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 9b5002c..67dd20c 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -4746,13 +4746,6 @@
fun:_ZN8chromeos22InputMethodLibraryImpl4InitEv
}
{
- bug_86468
- Memcheck:Leak
- fun:_Znw*
- ...
- fun:_ZN16content_settings50PrefProviderTest_MigrateSinglePatternSettings_Test8TestBodyEv
-}
-{
bug_86481
Memcheck:Leak
fun:_Znw*