commit 4356ff8d154606c7f472850bdc0886362e43babf
author buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Aug 13 21:55:18 2014 +0000
committer buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Aug 13 21:55:18 2014 +0000
tree 8f9751be668450894a802e2dba13378692092bb4
parent ba39a2fa6de680dd8b3b9ec548ebc06f9683ced3

(Auto)update libjingle 73248599-> 73249894

git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6896 4adac7df-926f-26a2-2b94-8c16560cd09d

media/webrtc/webrtcvideoengine_unittest.cc

diff --git a/media/webrtc/webrtcvideoengine_unittest.cc b/media/webrtc/webrtcvideoengine_unittest.cc
index cbf1e33..11edd05 100644
--- a/media/webrtc/webrtcvideoengine_unittest.cc
+++ b/media/webrtc/webrtcvideoengine_unittest.cc
@@ -2397,6 +2397,9 @@
   EXPECT_FALSE(channel_->SetRecvCodecs(codecs));
 }
 
+// Disable for TSan v2, see
+// https://code.google.com/p/webrtc/issues/detail?id=3671 for details.
+#if !defined(THREAD_SANITIZER)
 TEST_F(WebRtcVideoMediaChannelTest, GetRtpSendTimeExtension) {
   // Enable RTP timestamp extension.
   const int id = 12;
@@ -2408,6 +2411,7 @@
   EXPECT_TRUE(channel_->SetSendRtpHeaderExtensions(extensions));
   EXPECT_EQ(id, channel_->GetRtpSendTimeExtnId());
 }
+#endif  // if !defined(THREAD_SANITIZER)
 
 TEST_F(WebRtcVideoMediaChannelTest, SetSend) {
   Base::SetSend();