From 5dd5f5a3195c3a5fd26b6008992bb18af73d42d2 Mon Sep 17 00:00:00 2001
From: Tommi <tommi@webrtc.org>
Date: Tue, 21 Feb 2017 14:22:59 +0100
Subject: [PATCH] RembWithSendSideBwe: Rename |event_| to |stop_event_| and set
 it when the test ends.

BUG=webrtc:7200
R=stefan@webrtc.org

Review-Url: https://codereview.webrtc.org/2706223002 .
Cr-Commit-Position: refs/heads/master@{#16744}
---
 webrtc/video/end_to_end_tests.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index a029f58044..bf512d2592 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -2095,7 +2095,7 @@ TEST_P(EndToEndTest, RembWithSendSideBwe) {
           sender_ssrc_(0),
           remb_bitrate_bps_(1000000),
           receive_transport_(nullptr),
-          event_(false, false),
+          stop_event_(false, false),
           poller_thread_(&BitrateStatsPollingThread,
                          this,
                          "BitrateStatsPollingThread"),
@@ -2183,13 +2183,14 @@ TEST_P(EndToEndTest, RembWithSendSideBwe) {
         }
       }
 
-      return !event_.Wait(1000);
+      return !stop_event_.Wait(1000);
     }
 
     void PerformTest() override {
       poller_thread_.Start();
       EXPECT_TRUE(Wait())
           << "Timed out while waiting for bitrate to change according to REMB.";
+      stop_event_.Set();
       poller_thread_.Stop();
     }
 
@@ -2202,7 +2203,7 @@ TEST_P(EndToEndTest, RembWithSendSideBwe) {
     int remb_bitrate_bps_;
     std::unique_ptr<RtpRtcp> rtp_rtcp_;
     test::PacketTransport* receive_transport_;
-    rtc::Event event_;
+    rtc::Event stop_event_;
     rtc::PlatformThread poller_thread_;
     TestState state_;
     RateLimiter retransmission_rate_limiter_;