Revert of make the DtlsTransportWrapper inherit form DtlsTransportInternal

webrtc/pc/channel_unittest.cc

 /*
  *  Copyright 2009 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <memory>
 
 #include "webrtc/base/array_view.h"
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/fakeclock.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/media/base/fakertp.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/testutils.h"
-#include "webrtc/p2p/base/dtlstransportinternal.h"
 #include "webrtc/p2p/base/faketransportcontroller.h"
+#include "webrtc/p2p/base/transportchannelimpl.h"
 #include "webrtc/pc/channel.h"
 
 #define MAYBE_SKIP_TEST(feature)                    \
   if (!(rtc::SSLStreamAdapter::feature())) {  \
     LOG(LS_INFO) << "Feature disabled... skipping"; \
     return;                                         \
   }
 
 using cricket::CA_OFFER;
 using cricket::CA_PRANSWER;
 using cricket::CA_ANSWER;
 using cricket::CA_UPDATE;
-using cricket::DtlsTransportInternal;
 using cricket::FakeVoiceMediaChannel;
 using cricket::StreamParams;
+using cricket::TransportChannel;
 
 namespace {
 const cricket::AudioCodec kPcmuCodec(0, "PCMU", 64000, 8000, 1);
 const cricket::AudioCodec kPcmaCodec(8, "PCMA", 64000, 8000, 1);
 const cricket::AudioCodec kIsacCodec(103, "ISAC", 40000, 16000, 1);
 const cricket::VideoCodec kH264Codec(97, "H264");
 const cricket::VideoCodec kH264SvcCodec(99, "H264-SVC");
 const cricket::DataCodec kGoogleDataCodec(101, "google-data");
 const uint32_t kSsrc1 = 0x1111;
 const uint32_t kSsrc2 = 0x2222;
@@ skipping 158 matching lines @@
     rtc::Thread* signaling_thread =
         transport_controller ? transport_controller->signaling_thread()
                              : nullptr;
     typename T::Channel* channel = new typename T::Channel(
         worker_thread, network_thread, signaling_thread, engine, ch,
         cricket::CN_AUDIO, (flags & RTCP_MUX_REQUIRED) != 0,
         (flags & SECURE) != 0);
     rtc::CryptoOptions crypto_options;
     crypto_options.enable_gcm_crypto_suites = (flags & GCM_CIPHER) != 0;
     channel->SetCryptoOptions(crypto_options);
-    cricket::DtlsTransportInternal* rtp_dtls_transport =
-        transport_controller->CreateDtlsTransport(
+    cricket::TransportChannel* rtp_transport =
+        transport_controller->CreateTransportChannel(
             channel->content_name(), cricket::ICE_CANDIDATE_COMPONENT_RTP);
-    cricket::DtlsTransportInternal* rtcp_dtls_transport = nullptr;
+    cricket::TransportChannel* rtcp_transport = nullptr;
     if (channel->NeedsRtcpTransport()) {
-      rtcp_dtls_transport = transport_controller->CreateDtlsTransport(
+      rtcp_transport = transport_controller->CreateTransportChannel(
           channel->content_name(), cricket::ICE_CANDIDATE_COMPONENT_RTCP);
     }
-    if (!channel->Init_w(rtp_dtls_transport, rtcp_dtls_transport)) {
+    if (!channel->Init_w(rtp_transport, rtcp_transport)) {
       delete channel;
       channel = NULL;
     }
     return channel;
   }
 
   bool SendInitiate() {
     bool result = channel1_->SetLocalContent(&local_media_content1_,
                                              CA_OFFER, NULL);
     if (result) {
@@ skipping 54 matching lines @@
     return true;
   }
 
   bool AddStream1(int id) {
     return channel1_->AddRecvStream(cricket::StreamParams::CreateLegacy(id));
   }
   bool RemoveStream1(int id) {
     return channel1_->RemoveRecvStream(id);
   }
 
-  std::vector<cricket::DtlsTransportInternal*> GetChannels1() {
+  std::vector<cricket::TransportChannelImpl*> GetChannels1() {
     return transport_controller1_->channels_for_testing();
   }
 
-  std::vector<cricket::DtlsTransportInternal*> GetChannels2() {
+  std::vector<cricket::TransportChannelImpl*> GetChannels2() {
     return transport_controller2_->channels_for_testing();
   }
 
-  cricket::FakeDtlsTransport* GetFakeChannel1(int component) {
-    return transport_controller1_->GetFakeDtlsTransport_n(
+  cricket::FakeTransportChannel* GetFakeChannel1(int component) {
+    return transport_controller1_->GetFakeTransportChannel_n(
         channel1_->content_name(), component);
   }
 
-  cricket::FakeDtlsTransport* GetFakeChannel2(int component) {
-    return transport_controller2_->GetFakeDtlsTransport_n(
+  cricket::FakeTransportChannel* GetFakeChannel2(int component) {
+    return transport_controller2_->GetFakeTransportChannel_n(
         channel2_->content_name(), component);
   }
 
   void SendRtp1() {
     media_channel1_->SendRtp(rtp_packet_.data(), rtp_packet_.size(),
                              rtc::PacketOptions());
   }
   void SendRtp2() {
     media_channel2_->SendRtp(rtp_packet_.data(), rtp_packet_.size(),
                              rtc::PacketOptions());
@@ skipping 77 matching lines @@
   bool CheckNoRtcp1() {
     return media_channel1_->CheckNoRtcp();
   }
   bool CheckNoRtcp2() {
     return media_channel2_->CheckNoRtcp();
   }
   // Checks that the channel is using GCM iff GCM_CIPHER is set in flags.
   // Returns true if so.
   bool CheckGcmCipher(typename T::Channel* channel, int flags) {
     int suite;
-    if (!channel->rtp_dtls_transport()->GetSrtpCryptoSuite(&suite)) {
+    if (!channel->rtp_transport()->GetSrtpCryptoSuite(&suite)) {
       return false;
     }
 
     if (flags & GCM_CIPHER) {
       return rtc::IsGcmCryptoSuite(suite);
     } else {
       return (suite != rtc::SRTP_INVALID_CRYPTO_SUITE &&
           !rtc::IsGcmCryptoSuite(suite));
     }
   }
@@ skipping 109 matching lines @@
     EXPECT_TRUE(channel1_->SetRemoteContent(&content, CA_ANSWER, NULL));
     ASSERT_EQ(1U, media_channel1_->codecs().size());
     EXPECT_TRUE(CodecMatches(content.codecs()[0],
                              media_channel1_->codecs()[0]));
   }
 
   // Test that SetLocalContent and SetRemoteContent properly set RTCP
   // mux.
   void TestSetContentsRtcpMux() {
     CreateChannels(0, 0);
-    EXPECT_TRUE(channel1_->rtcp_dtls_transport() != NULL);
-    EXPECT_TRUE(channel2_->rtcp_dtls_transport() != NULL);
+    EXPECT_TRUE(channel1_->rtcp_transport() != NULL);
+    EXPECT_TRUE(channel2_->rtcp_transport() != NULL);
     typename T::Content content;
     CreateContent(0, kPcmuCodec, kH264Codec, &content);
     // Both sides agree on mux. Should no longer be a separate RTCP channel.
     content.set_rtcp_mux(true);
     EXPECT_TRUE(channel1_->SetLocalContent(&content, CA_OFFER, NULL));
     EXPECT_TRUE(channel1_->SetRemoteContent(&content, CA_ANSWER, NULL));
-    EXPECT_TRUE(channel1_->rtcp_dtls_transport() == NULL);
+    EXPECT_TRUE(channel1_->rtcp_transport() == NULL);
     // Only initiator supports mux. Should still have a separate RTCP channel.
     EXPECT_TRUE(channel2_->SetLocalContent(&content, CA_OFFER, NULL));
     content.set_rtcp_mux(false);
     EXPECT_TRUE(channel2_->SetRemoteContent(&content, CA_ANSWER, NULL));
-    EXPECT_TRUE(channel2_->rtcp_dtls_transport() != NULL);
+    EXPECT_TRUE(channel2_->rtcp_transport() != NULL);
   }
 
   // Test that SetLocalContent and SetRemoteContent properly set RTCP
   // mux when a provisional answer is received.
   void TestSetContentsRtcpMuxWithPrAnswer() {
     CreateChannels(0, 0);
-    EXPECT_TRUE(channel1_->rtcp_dtls_transport() != NULL);
-    EXPECT_TRUE(channel2_->rtcp_dtls_transport() != NULL);
+    EXPECT_TRUE(channel1_->rtcp_transport() != NULL);
+    EXPECT_TRUE(channel2_->rtcp_transport() != NULL);
     typename T::Content content;
     CreateContent(0, kPcmuCodec, kH264Codec, &content);
     content.set_rtcp_mux(true);
     EXPECT_TRUE(channel1_->SetLocalContent(&content, CA_OFFER, NULL));
     EXPECT_TRUE(channel1_->SetRemoteContent(&content, CA_PRANSWER, NULL));
-    EXPECT_TRUE(channel1_->rtcp_dtls_transport() != NULL);
+    EXPECT_TRUE(channel1_->rtcp_transport() != NULL);
     EXPECT_TRUE(channel1_->SetRemoteContent(&content, CA_ANSWER, NULL));
     // Both sides agree on mux. Should no longer be a separate RTCP channel.
-    EXPECT_TRUE(channel1_->rtcp_dtls_transport() == NULL);
+    EXPECT_TRUE(channel1_->rtcp_transport() == NULL);
     // Only initiator supports mux. Should still have a separate RTCP channel.
     EXPECT_TRUE(channel2_->SetLocalContent(&content, CA_OFFER, NULL));
     content.set_rtcp_mux(false);
     EXPECT_TRUE(channel2_->SetRemoteContent(&content, CA_PRANSWER, NULL));
     EXPECT_TRUE(channel2_->SetRemoteContent(&content, CA_ANSWER, NULL));
-    EXPECT_TRUE(channel2_->rtcp_dtls_transport() != NULL);
+    EXPECT_TRUE(channel2_->rtcp_transport() != NULL);
   }
 
   // Test that SetRemoteContent properly deals with a content update.
   void TestSetRemoteContentUpdate() {
     CreateChannels(0, 0);
     typename T::Content content;
     CreateContent(RTCP_MUX | SECURE, kPcmuCodec, kH264Codec, &content);
     EXPECT_EQ(0U, media_channel1_->codecs().size());
     EXPECT_TRUE(channel1_->SetLocalContent(&content, CA_OFFER, NULL));
     EXPECT_TRUE(channel1_->SetRemoteContent(&content, CA_ANSWER, NULL));
@@ skipping 359 matching lines @@
 
   // Tests that when the transport channel signals a candidate pair change
   // event, the media channel will receive a call on the network route change.
   void TestNetworkRouteChanges() {
     constexpr uint16_t kLocalNetId = 1;
     constexpr uint16_t kRemoteNetId = 2;
     constexpr int kLastPacketId = 100;
 
     CreateChannels(0, 0);
 
-    cricket::DtlsTransportInternal* transport_channel1 =
-        channel1_->rtp_dtls_transport();
+    cricket::TransportChannel* transport_channel1 = channel1_->rtp_transport();
     ASSERT_TRUE(transport_channel1);
     typename T::MediaChannel* media_channel1 =
         static_cast<typename T::MediaChannel*>(channel1_->media_channel());
     ASSERT_TRUE(media_channel1);
 
     media_channel1->set_num_network_route_changes(0);
     network_thread_->Invoke<void>(RTC_FROM_HERE, [transport_channel1] {
       // The transport channel becomes disconnected.
-      transport_channel1->ice_transport()->SignalSelectedCandidatePairChanged(
-          transport_channel1->ice_transport(), nullptr, -1, false);
+      transport_channel1->SignalSelectedCandidatePairChanged(
+          transport_channel1, nullptr, -1, false);
     });
     WaitForThreads();
     EXPECT_EQ(1, media_channel1->num_network_route_changes());
     EXPECT_FALSE(media_channel1->last_network_route().connected);
     media_channel1->set_num_network_route_changes(0);
 
     network_thread_->Invoke<void>(RTC_FROM_HERE, [this, transport_channel1,
                                                   media_channel1, kLocalNetId,
                                                   kRemoteNetId, kLastPacketId] {
       // The transport channel becomes connected.
       rtc::SocketAddress local_address("192.168.1.1", 1000 /* port number */);
       rtc::SocketAddress remote_address("192.168.1.2", 2000 /* port number */);
       std::unique_ptr<cricket::CandidatePairInterface> candidate_pair(
           transport_controller1_->CreateFakeCandidatePair(
               local_address, kLocalNetId, remote_address, kRemoteNetId));
-      transport_channel1->ice_transport()->SignalSelectedCandidatePairChanged(
-          transport_channel1->ice_transport(), candidate_pair.get(),
-          kLastPacketId, true);
+      transport_channel1->SignalSelectedCandidatePairChanged(
+          transport_channel1, candidate_pair.get(), kLastPacketId, true);
     });
     WaitForThreads();
     EXPECT_EQ(1, media_channel1->num_network_route_changes());
     rtc::NetworkRoute expected_network_route(true, kLocalNetId, kRemoteNetId,
                                              kLastPacketId);
     EXPECT_EQ(expected_network_route, media_channel1->last_network_route());
     EXPECT_EQ(kLastPacketId,
               media_channel1->last_network_route().last_sent_packet_id);
     constexpr int kTransportOverheadPerPacket = 28;  // Ipv4(20) + UDP(8).
     EXPECT_EQ(kTransportOverheadPerPacket,
@@ skipping 468 matching lines @@
     network_thread_->Invoke<void>(
         RTC_FROM_HERE, [this] { GetFakeChannel1(1)->SetDestination(nullptr); });
     EXPECT_TRUE(media_channel1_->sending());
 
     // Should fail also.
     SendRtp1();
     SendRtp2();
     WaitForThreads();
     EXPECT_TRUE(CheckRtp1());
     EXPECT_TRUE(CheckNoRtp2());
-    EXPECT_TRUE(CheckNoRtp1());
 
     // Gain writability back
     network_thread_->Invoke<void>(RTC_FROM_HERE, [this] {
       GetFakeChannel1(1)->SetDestination(GetFakeChannel2(1));
     });
     EXPECT_TRUE(media_channel1_->sending());
     SendRtp1();
     SendRtp2();
     WaitForThreads();
     EXPECT_TRUE(CheckRtp1());
@@ skipping 289 matching lines @@
                              rtc::PacketOptions());
     WaitForThreads();
     EXPECT_EQ(cricket::SrtpFilter::ERROR_FAIL, error_handler.error_);
     EXPECT_EQ(cricket::SrtpFilter::PROTECT, error_handler.mode_);
 
     // Testing failures in receiving packets.
     error_handler.error_ = cricket::SrtpFilter::ERROR_NONE;
     error_handler.mode_ = cricket::SrtpFilter::UNPROTECT;
 
     network_thread_->Invoke<void>(RTC_FROM_HERE, [this] {
-      cricket::DtlsTransportInternal* transport_channel =
-          channel2_->rtp_dtls_transport();
+      cricket::TransportChannel* transport_channel = channel2_->rtp_transport();
       transport_channel->SignalReadPacket(
           transport_channel, reinterpret_cast<const char*>(kBadPacket),
           sizeof(kBadPacket), rtc::PacketTime(), 0);
     });
     EXPECT_EQ(cricket::SrtpFilter::ERROR_FAIL, error_handler.error_);
     EXPECT_EQ(cricket::SrtpFilter::UNPROTECT, error_handler.mode_);
     // Terminate channels before the fake clock is destroyed.
     EXPECT_TRUE(SendTerminate());
   }
 
   void TestOnReadyToSend() {
     CreateChannels(0, 0);
-    DtlsTransportInternal* rtp = channel1_->rtp_dtls_transport();
-    DtlsTransportInternal* rtcp = channel1_->rtcp_dtls_transport();
+    TransportChannel* rtp = channel1_->rtp_transport();
+    TransportChannel* rtcp = channel1_->rtcp_transport();
     EXPECT_FALSE(media_channel1_->ready_to_send());
 
     network_thread_->Invoke<void>(RTC_FROM_HERE,
                                   [rtp] { rtp->SignalReadyToSend(rtp); });
     WaitForThreads();
     EXPECT_FALSE(media_channel1_->ready_to_send());
 
     network_thread_->Invoke<void>(RTC_FROM_HERE,
                                   [rtcp] { rtcp->SignalReadyToSend(rtcp); });
     WaitForThreads();
@@ skipping 29 matching lines @@
   }
 
   void TestOnReadyToSendWithRtcpMux() {
     CreateChannels(0, 0);
     typename T::Content content;
     CreateContent(0, kPcmuCodec, kH264Codec, &content);
     // Both sides agree on mux. Should no longer be a separate RTCP channel.
     content.set_rtcp_mux(true);
     EXPECT_TRUE(channel1_->SetLocalContent(&content, CA_OFFER, NULL));
     EXPECT_TRUE(channel1_->SetRemoteContent(&content, CA_ANSWER, NULL));
-    EXPECT_TRUE(channel1_->rtcp_dtls_transport() == NULL);
-    DtlsTransportInternal* rtp = channel1_->rtp_dtls_transport();
+    EXPECT_TRUE(channel1_->rtcp_transport() == NULL);
+    TransportChannel* rtp = channel1_->rtp_transport();
     EXPECT_FALSE(media_channel1_->ready_to_send());
     // In the case of rtcp mux, the SignalReadyToSend() from rtp channel
     // should trigger the MediaChannel's OnReadyToSend.
     network_thread_->Invoke<void>(RTC_FROM_HERE,
                                   [rtp] { rtp->SignalReadyToSend(rtp); });
     WaitForThreads();
     EXPECT_TRUE(media_channel1_->ready_to_send());
 
     network_thread_->Invoke<void>(RTC_FROM_HERE, [this] {
       channel1_->SetTransportChannelReadyToSend(false, false);
@@ skipping 158 matching lines @@
     cricket::TransportController* transport_controller,
     int flags) {
   rtc::Thread* signaling_thread =
       transport_controller ? transport_controller->signaling_thread() : nullptr;
   cricket::VideoChannel* channel = new cricket::VideoChannel(
       worker_thread, network_thread, signaling_thread, ch, cricket::CN_VIDEO,
       (flags & RTCP_MUX_REQUIRED) != 0, (flags & SECURE) != 0);
   rtc::CryptoOptions crypto_options;
   crypto_options.enable_gcm_crypto_suites = (flags & GCM_CIPHER) != 0;
   channel->SetCryptoOptions(crypto_options);
-  cricket::DtlsTransportInternal* rtp_dtls_transport =
-      transport_controller->CreateDtlsTransport(
+  cricket::TransportChannel* rtp_transport =
+      transport_controller->CreateTransportChannel(
           channel->content_name(), cricket::ICE_CANDIDATE_COMPONENT_RTP);
-  cricket::DtlsTransportInternal* rtcp_dtls_transport = nullptr;
+  cricket::TransportChannel* rtcp_transport = nullptr;
   if (channel->NeedsRtcpTransport()) {
-    rtcp_dtls_transport = transport_controller->CreateDtlsTransport(
+    rtcp_transport = transport_controller->CreateTransportChannel(
         channel->content_name(), cricket::ICE_CANDIDATE_COMPONENT_RTCP);
   }
-  if (!channel->Init_w(rtp_dtls_transport, rtcp_dtls_transport)) {
+  if (!channel->Init_w(rtp_transport, rtcp_transport)) {
     delete channel;
     channel = NULL;
   }
   return channel;
 }
 
 // override to add 0 parameter
 template<>
 bool ChannelTest<VideoTraits>::AddStream1(int id) {
   return channel1_->AddRecvStream(cricket::StreamParams::CreateLegacy(id));
@@ skipping 1205 matching lines @@
     cricket::TransportController* transport_controller,
     int flags) {
   rtc::Thread* signaling_thread =
       transport_controller ? transport_controller->signaling_thread() : nullptr;
   cricket::RtpDataChannel* channel = new cricket::RtpDataChannel(
       worker_thread, network_thread, signaling_thread, ch, cricket::CN_DATA,
       (flags & RTCP_MUX_REQUIRED) != 0, (flags & SECURE) != 0);
   rtc::CryptoOptions crypto_options;
   crypto_options.enable_gcm_crypto_suites = (flags & GCM_CIPHER) != 0;
   channel->SetCryptoOptions(crypto_options);
-  cricket::DtlsTransportInternal* rtp_dtls_transport =
-      transport_controller->CreateDtlsTransport(
+  cricket::TransportChannel* rtp_transport =
+      transport_controller->CreateTransportChannel(
           channel->content_name(), cricket::ICE_CANDIDATE_COMPONENT_RTP);
-  cricket::DtlsTransportInternal* rtcp_dtls_transport = nullptr;
+  cricket::TransportChannel* rtcp_transport = nullptr;
   if (channel->NeedsRtcpTransport()) {
-    rtcp_dtls_transport = transport_controller->CreateDtlsTransport(
+    rtcp_transport = transport_controller->CreateTransportChannel(
         channel->content_name(), cricket::ICE_CANDIDATE_COMPONENT_RTCP);
   }
-  if (!channel->Init_w(rtp_dtls_transport, rtcp_dtls_transport)) {
+  if (!channel->Init_w(rtp_transport, rtcp_transport)) {
     delete channel;
     channel = NULL;
   }
   return channel;
 }
 
 template <>
 void ChannelTest<DataTraits>::CreateContent(
     int flags,
     const cricket::AudioCodec& audio_codec,
@@ skipping 307 matching lines @@
         voice_channel_(
             rtc::Thread::Current(),
             rtc::Thread::Current(),
             rtc::Thread::Current(),
             &fake_media_engine_,
             new cricket::FakeVoiceMediaChannel(nullptr,
                                                cricket::AudioOptions()),
             cricket::CN_AUDIO,
             false,
             true) {
-    rtp_transport_ = fake_transport_controller_.CreateDtlsTransport(
+    rtp_transport_ = fake_transport_controller_.CreateTransportChannel(
         "foo", cricket::ICE_CANDIDATE_COMPONENT_RTP);
-    rtcp_transport_ = fake_transport_controller_.CreateDtlsTransport(
+    rtcp_transport_ = fake_transport_controller_.CreateTransportChannel(
         "foo", cricket::ICE_CANDIDATE_COMPONENT_RTCP);
     EXPECT_TRUE(voice_channel_.Init_w(rtp_transport_, rtcp_transport_));
   }
 
  protected:
   cricket::FakeTransportController fake_transport_controller_;
   cricket::FakeMediaEngine fake_media_engine_;
   cricket::VoiceChannel voice_channel_;
   // Will be cleaned up by FakeTransportController, don't need to worry about
   // deleting them in this test.
-  cricket::DtlsTransportInternal* rtp_transport_;
-  cricket::DtlsTransportInternal* rtcp_transport_;
+  cricket::TransportChannel* rtp_transport_;
+  cricket::TransportChannel* rtcp_transport_;
 };
 
 TEST_F(BaseChannelDeathTest, SetTransportWithNullRtpTransport) {
-  cricket::DtlsTransportInternal* new_rtcp_transport =
-      fake_transport_controller_.CreateDtlsTransport(
+  cricket::TransportChannel* new_rtcp_transport =
+      fake_transport_controller_.CreateTransportChannel(
           "bar", cricket::ICE_CANDIDATE_COMPONENT_RTCP);
   EXPECT_DEATH(voice_channel_.SetTransports(nullptr, new_rtcp_transport), "");
 }
 
 TEST_F(BaseChannelDeathTest, SetTransportWithMissingRtcpTransport) {
-  cricket::DtlsTransportInternal* new_rtp_transport =
-      fake_transport_controller_.CreateDtlsTransport(
+  cricket::TransportChannel* new_rtp_transport =
+      fake_transport_controller_.CreateTransportChannel(
           "bar", cricket::ICE_CANDIDATE_COMPONENT_RTP);
   EXPECT_DEATH(voice_channel_.SetTransports(new_rtp_transport, nullptr), "");
 }
 
 TEST_F(BaseChannelDeathTest, SetTransportWithUnneededRtcpTransport) {
   // Activate RTCP muxing, simulating offer/answer negotiation.
   cricket::AudioContentDescription content;
   content.set_rtcp_mux(true);
   ASSERT_TRUE(voice_channel_.SetLocalContent(&content, CA_OFFER, nullptr));
   ASSERT_TRUE(voice_channel_.SetRemoteContent(&content, CA_ANSWER, nullptr));
-  cricket::DtlsTransportInternal* new_rtp_transport =
-      fake_transport_controller_.CreateDtlsTransport(
+  cricket::TransportChannel* new_rtp_transport =
+      fake_transport_controller_.CreateTransportChannel(
           "bar", cricket::ICE_CANDIDATE_COMPONENT_RTP);
-  cricket::DtlsTransportInternal* new_rtcp_transport =
-      fake_transport_controller_.CreateDtlsTransport(
+  cricket::TransportChannel* new_rtcp_transport =
+      fake_transport_controller_.CreateTransportChannel(
           "bar", cricket::ICE_CANDIDATE_COMPONENT_RTCP);
   // After muxing is enabled, no RTCP transport should be passed in here.
   EXPECT_DEATH(
       voice_channel_.SetTransports(new_rtp_transport, new_rtcp_transport), "");
 }
 
 // This test will probably go away if/when we move the transport name out of
 // the transport classes and into their parent classes.
 TEST_F(BaseChannelDeathTest, SetTransportWithMismatchingTransportNames) {
-  cricket::DtlsTransportInternal* new_rtp_transport =
-      fake_transport_controller_.CreateDtlsTransport(
+  cricket::TransportChannel* new_rtp_transport =
+      fake_transport_controller_.CreateTransportChannel(
           "bar", cricket::ICE_CANDIDATE_COMPONENT_RTP);
-  cricket::DtlsTransportInternal* new_rtcp_transport =
-      fake_transport_controller_.CreateDtlsTransport(
+  cricket::TransportChannel* new_rtcp_transport =
+      fake_transport_controller_.CreateTransportChannel(
           "baz", cricket::ICE_CANDIDATE_COMPONENT_RTCP);
   EXPECT_DEATH(
       voice_channel_.SetTransports(new_rtp_transport, new_rtcp_transport), "");
 }
 
 #endif  // RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 
 // TODO(pthatcher): TestSetReceiver?