Suppress Valgrind reports in safe_browsing::ClientSideDetectionService::StartClientReportPhishingRequest

BUG=62943
TBR=glider
TEST=./tools/valgrind/waterfall.sh says they are all suppressed
Review URL: http://codereview.chromium.org/4890001

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

2 files changed, 49 insertions, 7 deletions

diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index cb0d582..04a7acd 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -145,7 +145,7 @@
   fun:std::vector::_M_insert_aux
   fun:std::vector::push_back
   fun:IPC::ChannelProxy::Context::OnAddFilter
-  fun:void DispatchToMethod
+  fun:*DispatchToMethod
   fun:RunnableMethod::Run
 }
 {
@@ -455,7 +455,7 @@
    Heapcheck:Leak
    fun:CallbackRunner* NewCallback
    fun:media::PipelineImpl::FilterStateTransitionTask
-   fun:void DispatchToMethod
+   fun:*DispatchToMethod
    fun:RunnableMethod::Run
    fun:MessageLoop::RunTask
 }
@@ -645,7 +645,7 @@
    Heapcheck:Leak
    fun:Callback*::Type* NewCallback
    fun:remoting::SessionManager::DoEncode
-   fun:void DispatchToMethod
+   fun:*DispatchToMethod
    fun:RunnableMethod::Run
 }
 {
@@ -715,7 +715,7 @@
    Heapcheck:Leak
    ...
    fun:net::SingleThreadedProxyResolver::Job::DoQuery
-   fun:void DispatchToMethod
+   fun:*DispatchToMethod
    fun:RunnableMethod::Run
    fun:MessageLoop::RunTask
    fun:MessageLoop::DeferOrRunPendingTask
@@ -874,7 +874,7 @@
    Heapcheck:Leak
    fun:base::WaitableEventWatcher::StartWatching
    fun:IPC::SyncChannel::SyncContext::OnChannelOpened
-   fun:void DispatchToMethod
+   fun:*DispatchToMethod
    fun:RunnableMethod::Run
    fun:MessageLoop::RunTask
 }
@@ -1053,3 +1053,12 @@
    fun:testing::HandleExceptionsInMethodIfSupported
    fun:testing::Test::Run
 }
+{
+   bug_62943
+   Heapcheck:Leak
+   ...
+   fun:FakeURLFetcherFactory::CreateURLFetcher
+   fun:URLFetcher::Create
+   fun:safe_browsing::ClientSideDetectionService::StartClientReportPhishingRequest
+   fun:*DispatchToMethod
+}
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 95f1fcf..5cb52ac 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -378,6 +378,14 @@
    fun:_ZN4spdy10SpdyFramer22DecompressControlFrameERKNS_16SpdyControlFrameE
    fun:_ZN4spdy10SpdyFramer15DecompressFrameERKNS_9SpdyFrameE
 }
+{
+  zlibz_value4_deflate_libpng
+  Memcheck:Value4
+  ...
+  fun:deflate*
+  ...
+  fun:*png*
+}
 #-- end of zlib filters
 {
    bug_33394
@@ -3254,7 +3262,6 @@
    fun:_ZN3net19TCPClientSocketPoolD0Ev
    fun:_ZN10scoped_ptrIN3net19TCPClientSocketPoolEED1Ev
 }
-
 {
    bug_62801
    Memcheck:Addr4
@@ -3270,4 +3277,30 @@
    fun:start_thread
    fun:clone
 }
-
+{
+   bug_62943 (Cond)
+   Memcheck:Cond
+   ...
+   fun:_ZN3gfx8PNGCodec6EncodeEPKhNS0_11ColorFormatEiiibPSt6vectorIhSaIhEE
+   fun:_ZN3gfx8PNGCodec18EncodeBGRASkBitmapERK8SkBitmapbPSt6vectorIhSaIhEE
+   fun:_ZN13safe_browsing26ClientSideDetectionService32StartClientReportPhishingRequestERK4GURLd8SkBitmapP14CallbackRunnerI6Tuple2IS1_bEE
+   fun:_Z16DispatchToMethodIN13safe_browsing26ClientSideDetectionServiceEMS1_FvRK4GURLd8SkBitmapP14CallbackRunnerI6Tuple2IS2_bEEES2_dS5_SA_EvPT_T0_RK6Tuple4IT1_T2_T3_T4_E
+}
+{
+   bug_62943 (Value4)
+   Memcheck:Value4
+   ...
+   fun:_ZN3gfx8PNGCodec6EncodeEPKhNS0_11ColorFormatEiiibPSt6vectorIhSaIhEE
+   fun:_ZN3gfx8PNGCodec18EncodeBGRASkBitmapERK8SkBitmapbPSt6vectorIhSaIhEE
+   fun:_ZN13safe_browsing26ClientSideDetectionService32StartClientReportPhishingRequestERK4GURLd8SkBitmapP14CallbackRunnerI6Tuple2IS1_bEE
+   fun:_Z16DispatchToMethodIN13safe_browsing26ClientSideDetectionServiceEMS1_FvRK4GURLd8SkBitmapP14CallbackRunnerI6Tuple2IS2_bEEES2_dS5_SA_EvPT_T0_RK6Tuple4IT1_T2_T3_T4_E
+}
+{
+   bug_62943 (Leak)
+   Memcheck:Leak
+   ...
+   fun:_ZN21FakeURLFetcherFactory16CreateURLFetcherEiRK4GURLN10URLFetcher11RequestTypeEPNS3_8DelegateE
+   fun:_ZN10URLFetcher6CreateEiRK4GURLNS_11RequestTypeEPNS_8DelegateE
+   fun:_ZN13safe_browsing26ClientSideDetectionService32StartClientReportPhishingRequestERK4GURLd8SkBitmapP14CallbackRunnerI6Tuple2IS1_bEE
+   fun:_Z16DispatchToMethodIN13safe_browsing26ClientSideDetectionServiceEMS1_FvRK4GURLd8SkBitmapP14CallbackRunnerI6Tuple2IS2_bEEES2_dS5_SA_EvPT_T0_RK6Tuple4IT1_T2_T3_T4_E
+}