Modified the rtp_receiver_unittests.

webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc

Index: webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc
index 9dd43c416abd02112087364eb925f5600d8e4cae..2c19298948b04cd92dbb0e24d431fb424c9aafbb 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc
@@ -211,41 +211,36 @@ TelephoneEventHandler* RtpReceiverImpl::GetTelephoneEventHandler() {
 }
 
 std::vector<RtpSource> RtpReceiverImpl::GetSources() const {
+  rtc::CritScope lock(&critical_section_rtp_receiver_);
+
   int64_t now_ms = clock_->TimeInMilliseconds();
   std::vector<RtpSource> sources;
 
-  {
-    rtc::CritScope lock(&critical_section_rtp_receiver_);
-
-    RTC_DCHECK(std::is_sorted(ssrc_sources_.begin(), ssrc_sources_.end(),
-                              [](const RtpSource& lhs, const RtpSource& rhs) {
-                                return lhs.timestamp_ms() < rhs.timestamp_ms();
-                              }));
-    RTC_DCHECK(std::is_sorted(csrc_sources_.begin(), csrc_sources_.end(),
-                              [](const RtpSource& lhs, const RtpSource& rhs) {
-                                return lhs.timestamp_ms() < rhs.timestamp_ms();
-                              }));
-
-    std::set<uint32_t> selected_ssrcs;
-    for (auto rit = ssrc_sources_.rbegin(); rit != ssrc_sources_.rend();
-         ++rit) {
-      if ((now_ms - rit->timestamp_ms()) > kGetSourcesTimeoutMs) {
-        break;
-      }
-      if (selected_ssrcs.insert(rit->source_id()).second) {
-        sources.push_back(*rit);
-      }
+  RTC_DCHECK(std::is_sorted(ssrc_sources_.begin(), ssrc_sources_.end(),
+                            [](const RtpSource& lhs, const RtpSource& rhs) {
+                              return lhs.timestamp_ms() < rhs.timestamp_ms();
+                            }));
+  RTC_DCHECK(std::is_sorted(csrc_sources_.begin(), csrc_sources_.end(),
+                            [](const RtpSource& lhs, const RtpSource& rhs) {
+                              return lhs.timestamp_ms() < rhs.timestamp_ms();
+                            }));
+
+  std::set<uint32_t> selected_ssrcs;
+  for (auto rit = ssrc_sources_.rbegin(); rit != ssrc_sources_.rend(); ++rit) {
+    if ((now_ms - rit->timestamp_ms()) > kGetSourcesTimeoutMs) {
+      break;
     }
-
-    for (auto rit = csrc_sources_.rbegin(); rit != csrc_sources_.rend();
-         ++rit) {
-      if ((now_ms - rit->timestamp_ms()) > kGetSourcesTimeoutMs) {
-        break;
-      }
+    if (selected_ssrcs.insert(rit->source_id()).second) {
       sources.push_back(*rit);
     }
-  }  // End critsect.
+  }
 
+  for (auto rit = csrc_sources_.rbegin(); rit != csrc_sources_.rend(); ++rit) {
+    if ((now_ms - rit->timestamp_ms()) > kGetSourcesTimeoutMs) {
+      break;
+    }
+    sources.push_back(*rit);
+  }
   return sources;
 }