Clean-up suppressions: remove duplicates from TSan/Mac and TSan/Linux, move a bunch of suppressions to the proper places

TBR=oshima
BUG=93932,100143
Review URL: http://codereview.chromium.org/8341110

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

3 files changed, 18 insertions, 70 deletions

diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 57dec1e..e6573d5 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -4305,6 +4305,17 @@
    fun:main
 }
 {
+   bug_93932
+   Memcheck:Overlap
+   fun:memcpy
+   fun:vp8_decode_update_thread_context
+   ...
+   fun:avcodec_decode_video2
+   fun:_ZN5media23FFmpegVideoDecodeEngine11DecodeFrameE13scoped_refptrINS_6BufferEE
+   fun:_ZN5media23FFmpegVideoDecodeEngine18ConsumeVideoSampleE13scoped_refptrINS_6BufferEE
+   fun:_ZN5media18FFmpegVideoDecoder18OnReadCompleteTaskE13scoped_refptrINS_6BufferEE
+}
+{
    bug_94195
    Memcheck:Leak
    ...
diff --git a/tools/valgrind/tsan/suppressions.txt b/tools/valgrind/tsan/suppressions.txt
index eae8830..cf762bd 100644
--- a/tools/valgrind/tsan/suppressions.txt
+++ b/tools/valgrind/tsan/suppressions.txt
@@ -345,14 +345,6 @@
    fun:AudioRendererImpl::Run
 }
 {
-   bug_100143
-   ThreadSanitizer:Race
-   ...
-   fun:GpuDataManager::Initialize
-   fun:GpuDataManager::GetInstance
-   fun:GpuBlacklistUpdater::SetupOnFileThread
-}
-{
   Intentional race in net_unittest
   ThreadSanitizer:Race
   fun:disk_cache::BackendImpl::GetEntryCount
diff --git a/tools/valgrind/tsan/suppressions_mac.txt b/tools/valgrind/tsan/suppressions_mac.txt
index 221bf89..88d5c46 100644
--- a/tools/valgrind/tsan/suppressions_mac.txt
+++ b/tools/valgrind/tsan/suppressions_mac.txt
@@ -157,68 +157,6 @@
   fun:*PCMQueueOutAudioOutputStream*Stop*
 }
 
-#-----------------------------------------------------------------------
-# 3. Suppressions for real chromium bugs that are not yet fixed.
-# These should all be in chromium's bug tracking system (but a few aren't yet).
-# Periodically we should sweep this file and the bug tracker clean by
-# running overnight and removing outdated bugs/suppressions.
-
-{
-   bug_93932_mac_a
-   ThreadSanitizer:Race
-   fun:frame_thread_free
-   fun:avcodec_close
-   fun:media::FFmpegVideoDecodeEngine::~FFmpegVideoDecodeEngine
-   fun:scoped_ptr::reset
-   fun:media::FFmpegVideoDecodeEngineTest::~FFmpegVideoDecodeEngineTest
-}
-{
-   bug_93932_mac_b
-   ThreadSanitizer:Race
-   fun:frame_thread_free
-   ...
-   fun:avcodec_close
-   fun:media::FFmpegVideoDecodeEngine::~FFmpegVideoDecodeEngine
-   ...
-   fun:scoped_ptr::~scoped_ptr
-   fun:media::FFmpegVideoDecoder::~FFmpegVideoDecoder
-   ...
-   fun:scoped_refptr::~scoped_refptr
-   fun:media::FFmpegVideoDecoderTest::~FFmpegVideoDecoderTest
-}
-{
-   bug_93932_mac_c
-   ThreadSanitizer:Race
-   ...
-   fun:media::FFmpegVideoDecodeEngine::DecodeFrame
-   fun:media::FFmpegVideoDecodeEngine::ConsumeVideoSample
-   fun:media::DemuxCompleteActionP2::gmock_Impl::gmock_PerformImpl
-   fun:testing::internal::ActionHelper::Perform
-   fun:testing::Action::Perform
-   fun:testing::internal::ActionResultHolder::PerformAction
-   fun:testing::internal::FunctionMockerBase::UntypedPerformAction
-   fun:testing::internal::UntypedFunctionMockerBase::UntypedInvokeWith
-   fun:testing::internal::FunctionMockerBase::InvokeWith
-   fun:testing::internal::FunctionMocker::Invoke
-   fun:media::FFmpegVideoDecodeEngineTest::ProduceVideoSample
-   fun:media::FFmpegVideoDecodeEngineTest::ProduceVideoSample
-   fun:media::FFmpegVideoDecodeEngine::ReadInput
-   fun:media::FFmpegVideoDecodeEngine::ProduceVideoFrame
-   fun:media::FFmpegVideoDecodeEngineTest::CallProduceVideoFrame
-   fun:media::FFmpegVideoDecodeEngineTest::DecodeIFrameThenTestFile
-   fun:media::FFmpegVideoDecodeEngineTest_DecodeFrame_SmallerWidth_Test::TestBody
-}
-{
-   bug_93932_mac_d
-   Memcheck:Overlap
-   fun:memcpy
-   fun:vp8_decode_update_thread_context
-   ...
-   fun:avcodec_decode_video2
-   fun:_ZN5media23FFmpegVideoDecodeEngine11DecodeFrameE13scoped_refptrINS_6BufferEE
-   fun:_ZN5media23FFmpegVideoDecodeEngine18ConsumeVideoSampleE13scoped_refptrINS_6BufferEE
-   fun:_ZN5media18FFmpegVideoDecoder18OnReadCompleteTaskE13scoped_refptrINS_6BufferEE
-}
 {
   bug_100313 TSan false positive
   ThreadSanitizer:Race
@@ -228,6 +166,13 @@
   fun:file_util::OpenFile
   fun:base::SharedMemory::CreateNamed
 }
+
+#-----------------------------------------------------------------------
+# 3. Suppressions for real chromium bugs that are not yet fixed.
+# These should all be in chromium's bug tracking system (but a few aren't yet).
+# Periodically we should sweep this file and the bug tracker clean by
+# running overnight and removing outdated bugs/suppressions.
+
 {
   bug_100772a
   ThreadSanitizer:Race