From ab9d6e1fd2366c7ef951b85458286ad60b88407e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@webrtc.org>
Date: Tue, 2 Feb 2021 16:49:02 +0100
Subject: [PATCH] Delete null JsepTransport constructor argument
 datagram_rtp_transport.

Bug: None
Change-Id: I97f2024a6d2811fa15bc5c93fd9d85982daa57fa
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/205321
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33175}
---
 pc/jsep_transport.cc            | 1 -
 pc/jsep_transport.h             | 1 -
 pc/jsep_transport_controller.cc | 6 ++----
 pc/jsep_transport_unittest.cc   | 3 +--
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pc/jsep_transport.cc b/pc/jsep_transport.cc
index 030ccff897..7beeba5881 100644
--- a/pc/jsep_transport.cc
+++ b/pc/jsep_transport.cc
@@ -77,7 +77,6 @@ JsepTransport::JsepTransport(
     std::unique_ptr<webrtc::RtpTransport> unencrypted_rtp_transport,
     std::unique_ptr<webrtc::SrtpTransport> sdes_transport,
     std::unique_ptr<webrtc::DtlsSrtpTransport> dtls_srtp_transport,
-    std::unique_ptr<webrtc::RtpTransportInternal> datagram_rtp_transport,
     std::unique_ptr<DtlsTransportInternal> rtp_dtls_transport,
     std::unique_ptr<DtlsTransportInternal> rtcp_dtls_transport,
     std::unique_ptr<SctpTransportInternal> sctp_transport)
diff --git a/pc/jsep_transport.h b/pc/jsep_transport.h
index 3d50f5e112..ad7faa0a55 100644
--- a/pc/jsep_transport.h
+++ b/pc/jsep_transport.h
@@ -100,7 +100,6 @@ class JsepTransport : public sigslot::has_slots<> {
       std::unique_ptr<webrtc::RtpTransport> unencrypted_rtp_transport,
       std::unique_ptr<webrtc::SrtpTransport> sdes_transport,
       std::unique_ptr<webrtc::DtlsSrtpTransport> dtls_srtp_transport,
-      std::unique_ptr<webrtc::RtpTransportInternal> datagram_rtp_transport,
       std::unique_ptr<DtlsTransportInternal> rtp_dtls_transport,
       std::unique_ptr<DtlsTransportInternal> rtcp_dtls_transport,
       std::unique_ptr<SctpTransportInternal> sctp_transport);
diff --git a/pc/jsep_transport_controller.cc b/pc/jsep_transport_controller.cc
index be049476eb..542dae4181 100644
--- a/pc/jsep_transport_controller.cc
+++ b/pc/jsep_transport_controller.cc
@@ -1015,7 +1015,6 @@ RTCError JsepTransportController::MaybeCreateJsepTransport(
   std::unique_ptr<RtpTransport> unencrypted_rtp_transport;
   std::unique_ptr<SrtpTransport> sdes_transport;
   std::unique_ptr<DtlsSrtpTransport> dtls_srtp_transport;
-  std::unique_ptr<RtpTransportInternal> datagram_rtp_transport;
 
   rtc::scoped_refptr<webrtc::IceTransportInterface> rtcp_ice;
   if (config_.rtcp_mux_policy !=
@@ -1051,9 +1050,8 @@ RTCError JsepTransportController::MaybeCreateJsepTransport(
       std::make_unique<cricket::JsepTransport>(
           content_info.name, certificate_, std::move(ice), std::move(rtcp_ice),
           std::move(unencrypted_rtp_transport), std::move(sdes_transport),
-          std::move(dtls_srtp_transport), std::move(datagram_rtp_transport),
-          std::move(rtp_dtls_transport), std::move(rtcp_dtls_transport),
-          std::move(sctp_transport));
+          std::move(dtls_srtp_transport), std::move(rtp_dtls_transport),
+          std::move(rtcp_dtls_transport), std::move(sctp_transport));
 
   jsep_transport->rtp_transport()->SignalRtcpPacketReceived.connect(
       this, &JsepTransportController::OnRtcpPacketReceived_n);
diff --git a/pc/jsep_transport_unittest.cc b/pc/jsep_transport_unittest.cc
index d8f2fff621..4dd2b5ce67 100644
--- a/pc/jsep_transport_unittest.cc
+++ b/pc/jsep_transport_unittest.cc
@@ -118,8 +118,7 @@ class JsepTransport2Test : public ::testing::Test, public sigslot::has_slots<> {
         kTransportName, /*local_certificate=*/nullptr, std::move(ice),
         std::move(rtcp_ice), std::move(unencrypted_rtp_transport),
         std::move(sdes_transport), std::move(dtls_srtp_transport),
-        /*datagram_rtp_transport=*/nullptr, std::move(rtp_dtls_transport),
-        std::move(rtcp_dtls_transport),
+        std::move(rtp_dtls_transport), std::move(rtcp_dtls_transport),
         /*sctp_transport=*/nullptr);
 
     signal_rtcp_mux_active_received_ = false;