Revert 63809 - Remove TSan supporessions on windows for remoting_unittests.

BUG=57832
TEST=None

Review URL: http://codereview.chromium.org/3606014

TBR=sergeyu@chromium.org
Review URL: http://codereview.chromium.org/4138004

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

5 files changed, 28 insertions, 17 deletions

diff --git a/remoting/protocol/jingle_chromoting_connection_unittest.cc b/remoting/protocol/jingle_chromoting_connection_unittest.cc
index 66a24b9..abd00f9 100644
--- a/remoting/protocol/jingle_chromoting_connection_unittest.cc
+++ b/remoting/protocol/jingle_chromoting_connection_unittest.cc
@@ -164,12 +164,10 @@ class JingleChromotingConnectionTest : public testing::Test {
         NewCallback(&client_connection_callback_,
                     &MockConnectionCallback::OnStateChange));
 
-    ASSERT_TRUE(
-        host_connected_event.TimedWait(base::TimeDelta::FromMilliseconds(
-            TestTimeouts::action_max_timeout_ms())));
-    ASSERT_TRUE(
-        client_connected_event.TimedWait(base::TimeDelta::FromMilliseconds(
-            TestTimeouts::action_max_timeout_ms())));
+    host_connected_event.TimedWait(base::TimeDelta::FromMilliseconds(
+        TestTimeouts::action_max_timeout_ms()));
+    client_connected_event.TimedWait(base::TimeDelta::FromMilliseconds(
+        TestTimeouts::action_max_timeout_ms()));
   }
 
   static void SignalEvent(base::WaitableEvent* event) {
@@ -225,9 +223,8 @@ class ChannelTesterBase : public base::RefCountedThreadSafe<ChannelTesterBase> {
   }
 
   void WaitFinished() {
-    ASSERT_TRUE(
-        done_event_.TimedWait(base::TimeDelta::FromMilliseconds(
-            TestTimeouts::action_max_timeout_ms())));
+    done_event_.TimedWait(base::TimeDelta::FromMilliseconds(
+        TestTimeouts::action_max_timeout_ms()));
   }
 
   virtual void CheckResults() = 0;
@@ -535,9 +532,8 @@ TEST_F(JingleChromotingConnectionTest, RejectConnection) {
       NewCallback(&client_connection_callback_,
                   &MockConnectionCallback::OnStateChange));
 
-  ASSERT_TRUE(
-      done_event.TimedWait(base::TimeDelta::FromMilliseconds(
-          TestTimeouts::action_max_timeout_ms())));
+  done_event.TimedWait(
+      base::TimeDelta::FromMilliseconds(TestTimeouts::action_max_timeout_ms()));
 }
 
 // Verify that we can connect two endpoints.
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index 47337ee..a9c71db 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -232,11 +232,7 @@ class ChromeTests:
     return self.SimpleTest("chrome", "printing_unittests")
 
   def TestRemoting(self):
-    return self.SimpleTest("chrome", "remoting_unittests",
-                           cmd_args=[
-                            "--ui-test-timeout=240000",
-                            "--ui-test-action-timeout=120000",
-                            "--ui-test-action-max-timeout=280000"])
+    return self.SimpleTest("chrome", "remoting_unittests")
 
   def TestIpc(self):
     return self.SimpleTest("ipc", "ipc_tests",
diff --git a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt
index e69de29..9ba3024 100644
--- a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt
+++ b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt
@@ -0,0 +1,6 @@
+# These tests fail under Dr. Memory; see http://crbug.com/57832
+JingleChromotingConnectionTest.TestVideoChannel
+JingleChromotingConnectionTest.TestVideoRtpChannel
+
+# Data race, detectable by Dr. Memory; see http://crbug.com/60536
+JingleChromotingConnectionTest.TestEventChannel
diff --git a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt
index e69de29..035246d 100644
--- a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt
+++ b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt
@@ -0,0 +1,6 @@
+# Fail under TSan, see http://crbug.com/57832
+JingleChromotingConnectionTest.TestVideoChannel
+JingleChromotingConnectionTest.TestVideoRtpChannel
+
+# Fails under TSan, see http://crbug.com/60536
+JingleChromotingConnectionTest.TestEventChannel
diff --git a/tools/valgrind/tsan/suppressions.txt b/tools/valgrind/tsan/suppressions.txt
index 8d567e6..f001012 100644
--- a/tools/valgrind/tsan/suppressions.txt
+++ b/tools/valgrind/tsan/suppressions.txt
@@ -55,6 +55,13 @@
   fun:ThreadSanitizerStartThread
 }
 
+{
+  bug_60536
+  ThreadSanitizer:Race
+  fun:*net::GrowableIOBuffer*
+  fun:remoting::TCPChannelTester::*
+}
+
 ############################
 # Real races in third_party
 {