From 449ad98aeb042ab09ae2da93ee94b9a90a1fc03c Mon Sep 17 00:00:00 2001
From: "buildbot@webrtc.org"
 <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 13 Aug 2014 21:55:18 +0000
Subject: [PATCH] (Auto)update libjingle 73248599-> 73249894

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6896 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 talk/media/webrtc/webrtcvideoengine_unittest.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/talk/media/webrtc/webrtcvideoengine_unittest.cc b/talk/media/webrtc/webrtcvideoengine_unittest.cc
index cbf1e333ad..11edd05b6f 100644
--- a/talk/media/webrtc/webrtcvideoengine_unittest.cc
+++ b/talk/media/webrtc/webrtcvideoengine_unittest.cc
@@ -2397,6 +2397,9 @@ TEST_F(WebRtcVideoMediaChannelTest, SetRecvCodecsUnsupportedCodec) {
   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 @@ TEST_F(WebRtcVideoMediaChannelTest, GetRtpSendTimeExtension) {
   EXPECT_TRUE(channel_->SetSendRtpHeaderExtensions(extensions));
   EXPECT_EQ(id, channel_->GetRtpSendTimeExtnId());
 }
+#endif  // if !defined(THREAD_SANITIZER)
 
 TEST_F(WebRtcVideoMediaChannelTest, SetSend) {
   Base::SetSend();