Fix race in EndToEndTest.ReceivesFlexfecAndSendsCorrespondingRtcp.

webrtc/video/end_to_end_tests.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include <algorithm>
@@ skipping 753 matching lines @@
 
     parser.Parse(data, length);
     if (parser.sender_ssrc() == kFlexfecLocalSsrc) {
       EXPECT_EQ(1, parser.receiver_report()->num_packets());
       const std::vector<rtcp::ReportBlock>& report_blocks =
           parser.receiver_report()->report_blocks();
       if (!report_blocks.empty()) {
         EXPECT_EQ(1U, report_blocks.size());
         EXPECT_EQ(test::CallTest::kFlexfecSendSsrc,
                   report_blocks[0].source_ssrc());
+        rtc::CritScope lock(&crit_);
         received_flexfec_rtcp_ = true;
       }
     }
 
     return SEND_PACKET;
   }
 
   void OnFrame(const VideoFrame& video_frame) override {
     rtc::CritScope lock(&crit_);
     // Rendering frame with timestamp of packet that was dropped -> FEC
@@ skipping 22 matching lines @@
   void PerformTest() override {
     EXPECT_TRUE(Wait())
         << "Timed out waiting for dropped frames to be rendered.";
   }
 
   rtc::CriticalSection crit_;
   std::set<uint32_t> dropped_sequence_numbers_ GUARDED_BY(crit_);
   // Since several packets can have the same timestamp a multiset is used
   // instead of a set.
   std::multiset<uint32_t> dropped_timestamps_ GUARDED_BY(crit_);
-  bool expect_flexfec_rtcp_;
-  bool received_flexfec_rtcp_;
+  const bool expect_flexfec_rtcp_;
+  bool received_flexfec_rtcp_ GUARDED_BY(crit_);
   Random random_;
 };
 
 TEST_P(EndToEndTest, ReceivesFlexfec) {
   FlexfecRenderObserver test(false);
   RunBaseTest(&test);
 }
 
 TEST_P(EndToEndTest, ReceivesFlexfecAndSendsCorrespondingRtcp) {
   FlexfecRenderObserver test(true);
@@ skipping 3298 matching lines @@
     std::unique_ptr<VideoEncoder> encoder_;
     std::unique_ptr<VideoDecoder> decoder_;
     rtc::CriticalSection crit_;
     int recorded_frames_ GUARDED_BY(crit_);
   } test(this);
 
   RunBaseTest(&test);
 }
 
 }  // namespace webrtc