Combining suppressions for linux, win and mac into single file (with widening of the call stack).

BUG=22923, 22932
TEST=Suppressed tests will work again, when fixed.
Review URL: http://codereview.chromium.org/235020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27236 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 44 deletions

diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index afe33bf..346ca9a 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -981,42 +981,20 @@
 {
    bug_22923
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    ...
    fun:_ZN13WorkerService21CreateDedicatedWorkerERK4GURLiiPN3IPC7Message6SenderEii
    fun:_ZN21ResourceMessageFilter23OnCreateDedicatedWorkerERK4GURLiPi
    fun:_Z16DispatchToMethodI21ResourceMessageFilterMS0_FvRK4GURLiPiES1_iiEvPT_T0_RK6Tuple2IT1_T2_EP6Tuple1IT3_E
-   fun:_ZN3IPC16MessageWithReplyI6Tuple2I4GURLiE6Tuple1IRiEE8DispatchI21ResourceMessageFilterMS9_FvRKS2_iPiEEEbPKNS_7MessageEPT_T0_
-   fun:_ZN21ResourceMessageFilter17OnMessageReceivedERKN3IPC7MessageE
-   fun:_ZN3IPC12ChannelProxy7Context10TryFiltersERKNS_7MessageE
-   fun:_ZN3IPC11SyncChannel11SyncContext17OnMessageReceivedERKNS_7MessageE
-   fun:_ZN3IPC7Channel11ChannelImpl23ProcessIncomingMessagesEv
-   fun:_ZN3IPC7Channel11ChannelImpl28OnFileCanReadWithoutBlockingEi
-   fun:_ZN4base19MessagePumpLibevent22OnLibeventNotificationEisPv
-   fun:event_process_active
-   fun:event_base_loop
-   fun:_ZN4base19MessagePumpLibevent3RunEPNS_11MessagePump8DelegateE
-   fun:_ZN11MessageLoop11RunInternalEv
-   fun:_ZN11MessageLoop10RunHandlerEv
-   fun:_ZN11MessageLoop3RunEv
-   fun:_ZN4base6Thread3RunEP11MessageLoop
-   fun:_ZN4base6Thread10ThreadMainEv
-   fun:_Z10ThreadFuncPv
-   fun:start_thread
-   fun:clone
 }
 {
    bug_22932
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    fun:_ZN7WebCore26PlatformMessagePortChannel19postMessageToRemoteEN3WTF10PassOwnPtrINS_18MessagePortChannel9EventDataEEE
    fun:_ZN7WebCore18MessagePortChannel19postMessageToRemoteEN3WTF10PassOwnPtrINS0_9EventDataEEE
    fun:_ZN7WebCore11MessagePort11postMessageERKNS_6StringEPKN3WTF6VectorINS4_6RefPtrIS0_EELj1EEERi
    fun:_ZN7WebCore8V8Custom32v8MessagePortPostMessageCallbackERKN2v89ArgumentsE
-   fun:_ZN2v88internal21Builtin_HandleApiCallENS0_9ArgumentsE
-   ...
-   fun:_ZN2v88internal6InvokeEbNS0_6HandleINS0_10JSFunctionEEENS1_INS0_6ObjectEEEiPPPS4_Pb
-   fun:_ZN2v88internal9Execution4CallENS0_6HandleINS0_10JSFunctionEEENS2_INS0_6ObjectEEEiPPPS5_Pb
 }
 {
    bug_22984
@@ -1070,6 +1048,4 @@
    fun:_ZN11MessageLoop10RunHandlerEv
    fun:_ZN11MessageLoop3RunEv
    fun:_Z10WorkerMainRK18MainFunctionParams
-   fun:ChromeMain
-   fun:main
 }
diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt
index 1ce8be5..aeac5b7 100644
--- a/tools/valgrind/memcheck/suppressions_mac.txt
+++ b/tools/valgrind/memcheck/suppressions_mac.txt
@@ -858,21 +858,3 @@
    fun:_ZN3net22MacTrustedCertificates27CopyTrustedCertificateArrayEv
    fun:_ZNK3net15X509Certificate6VerifyERKSsiPNS_16CertVerifyResultE
 }
-{
-   bug_22923
-   Memcheck:Leak
-   fun:_Znwm
-   ...
-   fun:_ZN13WorkerService21CreateDedicatedWorkerERK4GURLiiPN3IPC7Message6SenderEii
-   fun:_ZN21ResourceMessageFilter23OnCreateDedicatedWorkerERK4GURLiPi
-   fun:_Z16DispatchToMethodI21ResourceMessageFilterMS0_FvRK4GURLiPiES1_iiEvPT_T0_RK6Tuple2IT1_T2_EP6Tuple1IT3_E
-}
-{
-   bug_22932
-   Memcheck:Leak
-   ...
-   fun:_ZN7WebCore26PlatformMessagePortChannel19postMessageToRemoteEN3WTF10PassOwnPtrINS_18MessagePortChannel9EventDataEEE
-   fun:_ZN7WebCore18MessagePortChannel19postMessageToRemoteEN3WTF10PassOwnPtrINS0_9EventDataEEE
-   fun:_ZN7WebCore11MessagePort11postMessageERKNS_6StringEPKN3WTF6VectorINS4_6RefPtrIS0_EELm1EEERi
-   fun:_ZN7WebCore8V8Custom32v8MessagePortPostMessageCallbackERKN2v89ArgumentsE
-}
\ No newline at end of file