summaryrefslogtreecommitdiffstats
path: root/tools/valgrind
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-17 00:33:37 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-17 00:33:37 +0000
commite445193c06aa9882bf0fc6dda947eb018b5ac52b (patch)
treef7f749578922c0803d83d0017eb506be90072966 /tools/valgrind
parent4663e92cf5c5fb8f07c4d414b3abae0a02eb467f (diff)
downloadchromium_src-e445193c06aa9882bf0fc6dda947eb018b5ac52b.zip
chromium_src-e445193c06aa9882bf0fc6dda947eb018b5ac52b.tar.gz
chromium_src-e445193c06aa9882bf0fc6dda947eb018b5ac52b.tar.bz2
Remove suppressions for DesktopMediaPickerModelTest
The race was fixed in r218074 BUG=269965 TBR=wez@chromium.org Review URL: https://codereview.chromium.org/23235005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218128 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/valgrind')
-rw-r--r--tools/valgrind/gtest_exclude/unit_tests.gtest_linux.txt3
-rw-r--r--tools/valgrind/tsan_v2/suppressions.txt3
2 files changed, 0 insertions, 6 deletions
diff --git a/tools/valgrind/gtest_exclude/unit_tests.gtest_linux.txt b/tools/valgrind/gtest_exclude/unit_tests.gtest_linux.txt
index 5bc4480..c6141b3b 100644
--- a/tools/valgrind/gtest_exclude/unit_tests.gtest_linux.txt
+++ b/tools/valgrind/gtest_exclude/unit_tests.gtest_linux.txt
@@ -32,6 +32,3 @@ CpuInfoProviderTest.*
# Fails flakily. http://crbug.com/255771
NetworkStatsTestUDP.UDPEcho*
-
-# Fails flakily. http://crbug.com/269965
-DesktopMediaPickerModelTest.UpdateThumbnail \ No newline at end of file
diff --git a/tools/valgrind/tsan_v2/suppressions.txt b/tools/valgrind/tsan_v2/suppressions.txt
index 1e7fba8..274059e 100644
--- a/tools/valgrind/tsan_v2/suppressions.txt
+++ b/tools/valgrind/tsan_v2/suppressions.txt
@@ -108,9 +108,6 @@ race:tracked_objects::ThreadData::tls_index_
# http://crbug.com/268946
race:CommandLine::HasSwitch
-# http://crbug.com/269965
-race:DesktopMediaPickerModelTest_UpdateThumbnail_Test
-
# http://crbug.com/270037
race:gLibCleanupFunctions