From cf038f7eb6054f4e6286271440ed0488a3c7d18b Mon Sep 17 00:00:00 2001
From: eladalon <eladalon@webrtc.org>
Date: Thu, 10 Aug 2017 10:42:53 -0700
Subject: [PATCH] Fix (1) EndToEndTest.InitialProbing and (2)
 EndToEndTest.TriggerMidCallProbing

* EndToEndTest.InitialProbing had an uninitialized boolean.
* Both tests used RTC_DCHECK where one would normally expect an RTC_DCHECK.

BUG=webrtc:8085

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

diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index ed3ad82fbd..15db046b80 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -2380,7 +2380,9 @@ TEST_F(EndToEndTest, MAYBE_InitialProbing) {
   class InitialProbingTest : public ProbingTest {
    public:
     explicit InitialProbingTest(bool* success)
-        : ProbingTest(300000), success_(success) {}
+        : ProbingTest(300000), success_(success) {
+      *success_ = false;
+    }
 
     void PerformTest() override {
       int64_t start_time_ms = clock_->TimeInMilliseconds();
@@ -2403,7 +2405,7 @@ TEST_F(EndToEndTest, MAYBE_InitialProbing) {
     bool* const success_;
   };
 
-  bool success;
+  bool success = false;
   const int kMaxAttempts = 3;
   for (int i = 0; i < kMaxAttempts; ++i) {
     InitialProbingTest test(&success);
@@ -2411,8 +2413,8 @@ TEST_F(EndToEndTest, MAYBE_InitialProbing) {
     if (success)
       return;
   }
-  RTC_DCHECK(success) << "Failed to perform mid initial probing ("
-                      << kMaxAttempts << " attempts).";
+  EXPECT_TRUE(success) << "Failed to perform mid initial probing ("
+                       << kMaxAttempts << " attempts).";
 }
 
 // Fails on Linux MSan: bugs.webrtc.org/7428
@@ -2474,7 +2476,7 @@ TEST_F(EndToEndTest, TriggerMidCallProbing) {
     bool* const success_;
   };
 
-  bool success;
+  bool success = false;
   const int kMaxAttempts = 3;
   for (int i = 0; i < kMaxAttempts; ++i) {
     TriggerMidCallProbingTest test(&success);