summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 22:37:53 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 22:37:53 +0000
commit41cc711b8db94684e5cfc8c300f1a66714396c88 (patch)
treeed9ae876b789f3c180f60585c6ad7631b1d6e35f
parent76c2511ce8c7254696ee83a8a8906f853b00ca38 (diff)
downloadchromium_src-41cc711b8db94684e5cfc8c300f1a66714396c88.zip
chromium_src-41cc711b8db94684e5cfc8c300f1a66714396c88.tar.gz
chromium_src-41cc711b8db94684e5cfc8c300f1a66714396c88.tar.bz2
Revert 61175 - Revert r61105 and r61106
These two commits were suppressions for a small leak in DnsRRResolver which was fixed in 61136. BUG=57456 TEST=memory waterfall TBR=agl@chromium.org Review URL: http://codereview.chromium.org/3578007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61243 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--tools/heapcheck/suppressions.txt7
-rw-r--r--tools/valgrind/memcheck/suppressions.txt7
2 files changed, 14 insertions, 0 deletions
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 7e63076..83d8d5d 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -998,3 +998,10 @@
fun:::RelayReadDirectory::RunWork
fun:::MessageLoopRelay::ProcessOnTargetThread
}
+{
+ bug_57456
+ Heapcheck:Leak
+ fun:net::DnsRRResolver::Resolve
+ fun:net::DnsRRResolverTest_Resolve_Test::TestBody
+ fun:testing::Test::Run
+}
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 841e8a8..19ae8d9 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -2671,6 +2671,13 @@
fun:_ZN14CallbackRunnerI6Tuple2IN4base17PlatformFileErrorERKSt6vectorINS1_15file_util_proxy5EntryESaIS5_EEEE3RunIS2_S7_EEvRKT_RKT0_
}
{
+ bug_57456
+ Memcheck:Leak
+ fun:_Znw*
+ fun:_ZN3net13DnsRRResolver7ResolveERKSsttP14CallbackRunnerI6Tuple1IiEEPNS_10RRResponseEiRKNS_11BoundNetLogE
+ fun:_ZN3net30DnsRRResolverTest_Resolve_Test8TestBodyEv
+}
+{
bug_57464
Memcheck:Leak
fun:_Znw*