summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhaoqin@google.com <zhaoqin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-04 12:48:40 +0000
committerzhaoqin@google.com <zhaoqin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-04 12:48:40 +0000
commitb07a6e40cbc9189ca7740dfc1c5400e84386bfca (patch)
treeffcb80d769973c7863bcb4dfe41c5608dd5acc1e
parent100f116609b96f8fad3287bfb05d9b74df9ae08a (diff)
downloadchromium_src-b07a6e40cbc9189ca7740dfc1c5400e84386bfca.zip
chromium_src-b07a6e40cbc9189ca7740dfc1c5400e84386bfca.tar.gz
chromium_src-b07a6e40cbc9189ca7740dfc1c5400e84386bfca.tar.bz2
supprress memory leak from TemplateURLServiceTest::AddKeywordWithDate
TBR=Samusaaron3@gmail.com BUG=246560 TEST=waterfall Review URL: https://codereview.chromium.org/15934011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203943 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--tools/heapcheck/suppressions.txt14
-rw-r--r--tools/valgrind/memcheck/suppressions.txt7
2 files changed, 21 insertions, 0 deletions
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 1e33563..2c65475 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -1876,3 +1876,17 @@
fun:ash::test::AshTestBase::UpdateDisplay
fun:ash::internal::MirrorWindowControllerTest_MirrorCursor_Test::TestBody
}
+{
+ bug_246560a
+ Heapcheck:Leak
+ ...
+ fun:TemplateURLServiceTest::AddKeywordWithDate
+ fun:TemplateURLServiceTest_ResetNonExtensionURLs_Test::TestBody
+}
+{
+ bug_246560b
+ Heapcheck:Leak
+ fun:std::basic_string::_Rep::_S_create
+ fun:std::operator+
+ fun:TemplateURLServiceTest_ResetNonExtensionURLs_Test::TestBody
+}
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index c56e823..fb7ee76 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -7387,3 +7387,10 @@ fun:_ZN7content21RenderViewHostManager8NavigateERKNS_19NavigationEntryImplE
fun:_ZN12browser_sync10DeviceInfo21CreateLocalDeviceInfoEN4base8CallbackIFvRKS0_EEE
fun:_ZN30ManagedUserRegistrationService8RegisterERKSbItN4base20string16_char_traitsESaItEERKNS0_8CallbackIFvRK22GoogleServiceAuthErrorRKSsEEE
}
+{
+ bug_246560
+ Memcheck:Leak
+ fun:_Znw*
+ fun:_ZN22TemplateURLServiceTest18AddKeywordWithDateERKSsS1_S1_S1_S1_S1_bS1_N4base4TimeES3_
+ fun:_ZN49TemplateURLServiceTest_ResetNonExtensionURLs_Test8TestBodyEv
+}