summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorcbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 12:11:38 +0000
committercbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 12:11:38 +0000
commit22044935ef59c11209525fbdb99f62ede844627c (patch)
tree4e83c0b7384cdc62cb01c6d7be250223b372a596 /tools
parent0d6d88acf76fa5894c42ffcd75737f4a2382db60 (diff)
downloadchromium_src-22044935ef59c11209525fbdb99f62ede844627c.zip
chromium_src-22044935ef59c11209525fbdb99f62ede844627c.tar.gz
chromium_src-22044935ef59c11209525fbdb99f62ede844627c.tar.bz2
More suppressions for DBusPowerSaveBlocker
BUG=105699 TBR=mdm@chromium.org Review URL: http://codereview.chromium.org/8725028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/heapcheck/suppressions.txt2
-rw-r--r--tools/valgrind/memcheck/suppressions.txt16
2 files changed, 17 insertions, 1 deletions
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 13180aa..eac94ed 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -1800,7 +1800,7 @@
bug_105699
Heapcheck:Leak
fun:base::Environment::Create
- fun:::DBusPowerSaveBlocker::DBusPowerSaveBlocker
+ fun:::DBusPowerSaveBlocker*
fun:DefaultSingletonTraits::New
fun:Singleton::get
fun:::DBusPowerSaveBlocker::GetInstance
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index d07131c..b76c99b 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -5180,6 +5180,22 @@
fun:_ZN10scoped_ptrI22TestProfileSyncServiceE5resetEPS0_
fun:_ZN30ProfileSyncServiceTypedUrlTest8TearDownEv
}
+{
+ bug_105699
+ Memcheck:Leak
+ fun:_Znw*
+ fun:_ZN4base11Environment6CreateEv
+ fun:_ZN12_GLOBAL__N_120DBusPowerSaveBlockerC1Ev
+ fun:_ZN22DefaultSingletonTraitsIN12_GLOBAL__N_120DBusPowerSaveBlockerEE3NewEv
+ fun:_ZN9SingletonIN12_GLOBAL__N_120DBusPowerSaveBlockerE22DefaultSingletonTraitsIS1_ES1_E3getEv
+ fun:_ZN12_GLOBAL__N_120DBusPowerSaveBlocker11GetInstanceEv
+ fun:_ZN16PowerSaveBlocker10ApplyBlockENS_20PowerSaveBlockerTypeE
+ fun:_ZN16PowerSaveBlocker16AdjustBlockCountERKSt6vectorIiSaIiEE
+ fun:_ZN4base8internal15RunnableAdapterIPFvRKSt6vectorIiSaIiEEEE3RunES6_
+ fun:_ZN4base8internal12InvokeHelperILb0EvNS0_15RunnableAdapterIPFvRKSt6vectorIiSaIiEEEEES8_E8MakeItSoESA_S7_
+ fun:_ZN4base8internal7InvokerILi1ENS0_9BindStateINS0_15RunnableAdapterIPFvRKSt6vectorIiSaIiEEEEES9_FvS6_EEES9_E3RunEPNS0_13BindStateBaseE
+ fun:_ZNK4base8CallbackIFvvEE3RunEv
+}
#-----------------------------------------------------------------------
# 4. These only occur on our Google workstations