From 39e1289e6480f0a8c8d9b8f9f63a5ca255209093 Mon Sep 17 00:00:00 2001
From: tommi <tommi@webrtc.org>
Date: Mon, 13 Mar 2017 05:15:14 -0700
Subject: [PATCH] Avoid holding lock while calling stream_resetter_ in
 MaxPaddingSetTest

BUG=webrtc:7330

Review-Url: https://codereview.webrtc.org/2745083002
Cr-Commit-Position: refs/heads/master@{#17207}
---
 webrtc/video/video_send_stream_tests.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index 05a4b41d40..2cd542a302 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -1535,7 +1535,9 @@ class MaxPaddingSetTest : public test::SendTest {
         send_stream_config_(nullptr),
         packets_sent_(0),
         running_without_padding_(test_switch_content_type),
-        stream_resetter_(stream_reset_fun) {}
+        stream_resetter_(stream_reset_fun) {
+    RTC_DCHECK(stream_resetter_);
+  }
 
   void OnVideoStreamsCreated(
       VideoSendStream* send_stream,
@@ -1598,8 +1600,6 @@ class MaxPaddingSetTest : public test::SendTest {
     if (RunningWithoutPadding()) {
       ASSERT_TRUE(
           content_switch_event_.Wait(test::CallTest::kDefaultTimeoutMs));
-      rtc::CritScope lock(&crit_);
-      RTC_DCHECK(stream_resetter_);
       (*stream_resetter_)(send_stream_config_, encoder_config_);
     }