commit 14cf12b1eaf6155dc474c68c5562597157c65b01
author Taylor Brandstetter <deadbeef@webrtc.org> Tue Aug 23 01:14:14 2016
committer Taylor Brandstetter <deadbeef@webrtc.org> Tue Aug 23 01:14:21 2016
tree 7d8443910ed87c6f30288167dd5db2daae571c1c
parent 23d947dc98246d89479152a4dd8308be4e734f3c

Fixing TSan data race warning in video end-to-end tests.

Needed to use critical section in "SendRtp"/"SendRtcp", which is what
the real implementation ultimately does.

TBR=stefan@webrtc.org

Review URL: https://codereview.webrtc.org/2271433002 .

Cr-Commit-Position: refs/heads/master@{#13857}

webrtc/video/end_to_end_tests.cc

diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index 528338d..60063f4 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -98,16 +98,19 @@
     bool SendRtp(const uint8_t* packet,
                  size_t length,
                  const PacketOptions& options) override {
+      rtc::CritScope lock(&crit_);
       need_rtp_ = false;
       return true;
     }
 
     bool SendRtcp(const uint8_t* packet, size_t length) override {
+      rtc::CritScope lock(&crit_);
       need_rtcp_ = false;
       return true;
     }
     bool need_rtp_;
     bool need_rtcp_;
+    rtc::CriticalSection crit_;
   };
 
   void DecodesRetransmittedFrame(bool enable_rtx, bool enable_red);