Revert of make the DtlsTransportWrapper inherit form DtlsTransportInternal

webrtc/p2p/base/transportcontroller_unittest.cc

 /*
  *  Copyright 2015 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.
  */
 
@@ skipping 53 matching lines @@
     transport_controller_->SignalConnectionState.connect(
         this, &TransportControllerTest::OnConnectionState);
     transport_controller_->SignalReceiving.connect(
         this, &TransportControllerTest::OnReceiving);
     transport_controller_->SignalGatheringState.connect(
         this, &TransportControllerTest::OnGatheringState);
     transport_controller_->SignalCandidatesGathered.connect(
         this, &TransportControllerTest::OnCandidatesGathered);
   }
 
-  FakeDtlsTransport* CreateChannel(const std::string& content, int component) {
-    DtlsTransportInternal* channel =
-        transport_controller_->CreateDtlsTransport_n(content, component);
-    return static_cast<FakeDtlsTransport*>(channel);
+  FakeTransportChannel* CreateChannel(const std::string& content,
+                                      int component) {
+    TransportChannel* channel =
+        transport_controller_->CreateTransportChannel_n(content, component);
+    return static_cast<FakeTransportChannel*>(channel);
   }
 
   void DestroyChannel(const std::string& content, int component) {
-    transport_controller_->DestroyDtlsTransport_n(content, component);
+    transport_controller_->DestroyTransportChannel_n(content, component);
   }
 
   Candidate CreateCandidate(int component) {
     Candidate c;
     c.set_address(rtc::SocketAddress("192.168.1.1", 8000));
     c.set_component(1);
     c.set_protocol(UDP_PROTOCOL_NAME);
     c.set_priority(1);
     return c;
   }
 
   // Used for thread hopping test.
   void CreateChannelsAndCompleteConnectionOnNetworkThread() {
     network_thread_->Invoke<void>(
         RTC_FROM_HERE,
         rtc::Bind(
             &TransportControllerTest::CreateChannelsAndCompleteConnection_w,
             this));
   }
 
   void CreateChannelsAndCompleteConnection_w() {
     transport_controller_->SetIceRole(ICEROLE_CONTROLLING);
-    FakeDtlsTransport* channel1 = CreateChannel("audio", 1);
+    FakeTransportChannel* channel1 = CreateChannel("audio", 1);
     ASSERT_NE(nullptr, channel1);
-    FakeDtlsTransport* channel2 = CreateChannel("video", 1);
+    FakeTransportChannel* channel2 = CreateChannel("video", 1);
     ASSERT_NE(nullptr, channel2);
 
     TransportDescription local_desc(std::vector<std::string>(), kIceUfrag1,
                                     kIcePwd1, ICEMODE_FULL,
                                     CONNECTIONROLE_ACTPASS, nullptr);
     std::string err;
     transport_controller_->SetLocalTransportDescription("audio", local_desc,
                                                         CA_OFFER, &err);
     transport_controller_->SetLocalTransportDescription("video", local_desc,
                                                         CA_OFFER, &err);
     transport_controller_->MaybeStartGathering();
-    channel1->ice_transport()->SignalCandidateGathered(
-        channel1->ice_transport(), CreateCandidate(1));
-    channel2->ice_transport()->SignalCandidateGathered(
-        channel2->ice_transport(), CreateCandidate(1));
+    channel1->SignalCandidateGathered(channel1, CreateCandidate(1));
+    channel2->SignalCandidateGathered(channel2, CreateCandidate(1));
     channel1->SetCandidatesGatheringComplete();
     channel2->SetCandidatesGatheringComplete();
     channel1->SetConnectionCount(2);
     channel2->SetConnectionCount(2);
     channel1->SetReceiving(true);
     channel2->SetReceiving(true);
     channel1->SetWritable(true);
     channel2->SetWritable(true);
     channel1->SetConnectionCount(1);
     channel2->SetConnectionCount(1);
@@ skipping 57 matching lines @@
   int receiving_signal_count_ = 0;
   int gathering_state_signal_count_ = 0;
   int candidates_signal_count_ = 0;
 
   // Used to make sure signals only come on signaling thread.
   rtc::Thread* const signaling_thread_ = nullptr;
   bool signaled_on_non_signaling_thread_ = false;
 };
 
 TEST_F(TransportControllerTest, TestSetIceConfig) {
-  FakeDtlsTransport* channel1 = CreateChannel("audio", 1);
+  FakeTransportChannel* channel1 = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel1);
 
   transport_controller_->SetIceConfig(
       CreateIceConfig(1000, GATHER_CONTINUALLY));
   EXPECT_EQ(1000, channel1->receiving_timeout());
   EXPECT_TRUE(channel1->gather_continually());
 
   transport_controller_->SetIceConfig(
       CreateIceConfig(1000, GATHER_CONTINUALLY_AND_RECOVER));
   // Test that value stored in controller is applied to new channels.
-  FakeDtlsTransport* channel2 = CreateChannel("video", 1);
+  FakeTransportChannel* channel2 = CreateChannel("video", 1);
   ASSERT_NE(nullptr, channel2);
   EXPECT_EQ(1000, channel2->receiving_timeout());
   EXPECT_TRUE(channel2->gather_continually());
 }
 
 TEST_F(TransportControllerTest, TestSetSslMaxProtocolVersion) {
   EXPECT_TRUE(transport_controller_->SetSslMaxProtocolVersion(
       rtc::SSL_PROTOCOL_DTLS_12));
-  FakeDtlsTransport* channel = CreateChannel("audio", 1);
+  FakeTransportChannel* channel = CreateChannel("audio", 1);
 
   ASSERT_NE(nullptr, channel);
   EXPECT_EQ(rtc::SSL_PROTOCOL_DTLS_12, channel->ssl_max_protocol_version());
 
   // Setting max version after transport is created should fail.
   EXPECT_FALSE(transport_controller_->SetSslMaxProtocolVersion(
       rtc::SSL_PROTOCOL_DTLS_10));
 }
 
 TEST_F(TransportControllerTest, TestSetIceRole) {
-  FakeDtlsTransport* channel1 = CreateChannel("audio", 1);
+  FakeTransportChannel* channel1 = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel1);
 
   transport_controller_->SetIceRole(ICEROLE_CONTROLLING);
   EXPECT_EQ(ICEROLE_CONTROLLING, channel1->GetIceRole());
   transport_controller_->SetIceRole(ICEROLE_CONTROLLED);
   EXPECT_EQ(ICEROLE_CONTROLLED, channel1->GetIceRole());
 
   // Test that value stored in controller is applied to new channels.
-  FakeDtlsTransport* channel2 = CreateChannel("video", 1);
+  FakeTransportChannel* channel2 = CreateChannel("video", 1);
   ASSERT_NE(nullptr, channel2);
   EXPECT_EQ(ICEROLE_CONTROLLED, channel2->GetIceRole());
 }
 
 // Test that when one channel encounters a role conflict, the ICE role is
 // swapped on every channel.
 TEST_F(TransportControllerTest, TestIceRoleConflict) {
-  FakeDtlsTransport* channel1 = CreateChannel("audio", 1);
+  FakeTransportChannel* channel1 = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel1);
-  FakeDtlsTransport* channel2 = CreateChannel("video", 1);
+  FakeTransportChannel* channel2 = CreateChannel("video", 1);
   ASSERT_NE(nullptr, channel2);
 
   transport_controller_->SetIceRole(ICEROLE_CONTROLLING);
   EXPECT_EQ(ICEROLE_CONTROLLING, channel1->GetIceRole());
   EXPECT_EQ(ICEROLE_CONTROLLING, channel2->GetIceRole());
 
-  channel1->ice_transport()->SignalRoleConflict(channel1->ice_transport());
+  channel1->SignalRoleConflict(channel1);
   EXPECT_EQ(ICEROLE_CONTROLLED, channel1->GetIceRole());
   EXPECT_EQ(ICEROLE_CONTROLLED, channel2->GetIceRole());
 
   // Should be able to handle a second role conflict. The remote endpoint can
   // change its role/tie-breaker when it does an ICE restart.
-  channel2->ice_transport()->SignalRoleConflict(channel2->ice_transport());
+  channel2->SignalRoleConflict(channel2);
   EXPECT_EQ(ICEROLE_CONTROLLING, channel1->GetIceRole());
   EXPECT_EQ(ICEROLE_CONTROLLING, channel2->GetIceRole());
 }
 
 TEST_F(TransportControllerTest, TestGetSslRole) {
-  FakeDtlsTransport* channel = CreateChannel("audio", 1);
+  FakeTransportChannel* channel = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel);
   ASSERT_TRUE(channel->SetSslRole(rtc::SSL_CLIENT));
   rtc::SSLRole role;
   EXPECT_FALSE(transport_controller_->GetSslRole("video", &role));
   EXPECT_TRUE(transport_controller_->GetSslRole("audio", &role));
   EXPECT_EQ(rtc::SSL_CLIENT, role);
 }
 
 TEST_F(TransportControllerTest, TestSetAndGetLocalCertificate) {
   rtc::scoped_refptr<rtc::RTCCertificate> certificate1 =
       rtc::RTCCertificate::Create(std::unique_ptr<rtc::SSLIdentity>(
           rtc::SSLIdentity::Generate("session1", rtc::KT_DEFAULT)));
   rtc::scoped_refptr<rtc::RTCCertificate> certificate2 =
       rtc::RTCCertificate::Create(std::unique_ptr<rtc::SSLIdentity>(
           rtc::SSLIdentity::Generate("session2", rtc::KT_DEFAULT)));
   rtc::scoped_refptr<rtc::RTCCertificate> returned_certificate;
 
-  FakeDtlsTransport* channel1 = CreateChannel("audio", 1);
+  FakeTransportChannel* channel1 = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel1);
 
   EXPECT_TRUE(transport_controller_->SetLocalCertificate(certificate1));
   EXPECT_TRUE(transport_controller_->GetLocalCertificate(
       "audio", &returned_certificate));
   EXPECT_EQ(certificate1->identity()->certificate().ToPEMString(),
             returned_certificate->identity()->certificate().ToPEMString());
 
   // Should fail if called for a nonexistant transport.
   EXPECT_FALSE(transport_controller_->GetLocalCertificate(
       "video", &returned_certificate));
 
   // Test that identity stored in controller is applied to new channels.
-  FakeDtlsTransport* channel2 = CreateChannel("video", 1);
+  FakeTransportChannel* channel2 = CreateChannel("video", 1);
   ASSERT_NE(nullptr, channel2);
   EXPECT_TRUE(transport_controller_->GetLocalCertificate(
       "video", &returned_certificate));
   EXPECT_EQ(certificate1->identity()->certificate().ToPEMString(),
             returned_certificate->identity()->certificate().ToPEMString());
 
   // Shouldn't be able to change the identity once set.
   EXPECT_FALSE(transport_controller_->SetLocalCertificate(certificate2));
 }
 
 TEST_F(TransportControllerTest, TestGetRemoteSSLCertificate) {
   rtc::FakeSSLCertificate fake_certificate("fake_data");
 
-  FakeDtlsTransport* channel = CreateChannel("audio", 1);
+  FakeTransportChannel* channel = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel);
 
   channel->SetRemoteSSLCertificate(&fake_certificate);
   std::unique_ptr<rtc::SSLCertificate> returned_certificate =
       transport_controller_->GetRemoteSSLCertificate("audio");
   EXPECT_TRUE(returned_certificate);
   EXPECT_EQ(fake_certificate.ToPEMString(),
             returned_certificate->ToPEMString());
 
   // Should fail if called for a nonexistant transport.
   EXPECT_FALSE(transport_controller_->GetRemoteSSLCertificate("video"));
 }
 
 TEST_F(TransportControllerTest, TestSetLocalTransportDescription) {
-  FakeDtlsTransport* channel = CreateChannel("audio", 1);
+  FakeTransportChannel* channel = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel);
   TransportDescription local_desc(std::vector<std::string>(), kIceUfrag1,
                                   kIcePwd1, ICEMODE_FULL,
                                   CONNECTIONROLE_ACTPASS, nullptr);
   std::string err;
   EXPECT_TRUE(transport_controller_->SetLocalTransportDescription(
       "audio", local_desc, CA_OFFER, &err));
   // Check that ICE ufrag and pwd were propagated to channel.
   EXPECT_EQ(kIceUfrag1, channel->ice_ufrag());
   EXPECT_EQ(kIcePwd1, channel->ice_pwd());
   // After setting local description, we should be able to start gathering
   // candidates.
   transport_controller_->MaybeStartGathering();
   EXPECT_EQ_WAIT(kIceGatheringGathering, gathering_state_, kTimeout);
   EXPECT_EQ(1, gathering_state_signal_count_);
 }
 
 TEST_F(TransportControllerTest, TestSetRemoteTransportDescription) {
-  FakeDtlsTransport* channel = CreateChannel("audio", 1);
+  FakeTransportChannel* channel = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel);
   TransportDescription remote_desc(std::vector<std::string>(), kIceUfrag1,
                                    kIcePwd1, ICEMODE_FULL,
                                    CONNECTIONROLE_ACTPASS, nullptr);
   std::string err;
   EXPECT_TRUE(transport_controller_->SetRemoteTransportDescription(
       "audio", remote_desc, CA_OFFER, &err));
   // Check that ICE ufrag and pwd were propagated to channel.
   EXPECT_EQ(kIceUfrag1, channel->remote_ice_ufrag());
   EXPECT_EQ(kIcePwd1, channel->remote_ice_pwd());
 }
 
 TEST_F(TransportControllerTest, TestAddRemoteCandidates) {
-  FakeDtlsTransport* channel = CreateChannel("audio", 1);
+  FakeTransportChannel* channel = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel);
   Candidates candidates;
   candidates.push_back(CreateCandidate(1));
   std::string err;
   EXPECT_TRUE(
       transport_controller_->AddRemoteCandidates("audio", candidates, &err));
   EXPECT_EQ(1U, channel->remote_candidates().size());
 }
 
 TEST_F(TransportControllerTest, TestReadyForRemoteCandidates) {
-  FakeDtlsTransport* channel = CreateChannel("audio", 1);
+  FakeTransportChannel* channel = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel);
   // We expect to be ready for remote candidates only after local and remote
   // descriptions are set.
   EXPECT_FALSE(transport_controller_->ReadyForRemoteCandidates("audio"));
 
   std::string err;
   TransportDescription remote_desc(std::vector<std::string>(), kIceUfrag1,
                                    kIcePwd1, ICEMODE_FULL,
                                    CONNECTIONROLE_ACTPASS, nullptr);
   EXPECT_TRUE(transport_controller_->SetRemoteTransportDescription(
       "audio", remote_desc, CA_OFFER, &err));
   EXPECT_FALSE(transport_controller_->ReadyForRemoteCandidates("audio"));
 
   TransportDescription local_desc(std::vector<std::string>(), kIceUfrag2,
                                   kIcePwd2, ICEMODE_FULL,
                                   CONNECTIONROLE_ACTPASS, nullptr);
   EXPECT_TRUE(transport_controller_->SetLocalTransportDescription(
       "audio", local_desc, CA_ANSWER, &err));
   EXPECT_TRUE(transport_controller_->ReadyForRemoteCandidates("audio"));
 }
 
 TEST_F(TransportControllerTest, TestGetStats) {
-  FakeDtlsTransport* channel1 = CreateChannel("audio", 1);
+  FakeTransportChannel* channel1 = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel1);
-  FakeDtlsTransport* channel2 = CreateChannel("audio", 2);
+  FakeTransportChannel* channel2 = CreateChannel("audio", 2);
   ASSERT_NE(nullptr, channel2);
-  FakeDtlsTransport* channel3 = CreateChannel("video", 1);
+  FakeTransportChannel* channel3 = CreateChannel("video", 1);
   ASSERT_NE(nullptr, channel3);
 
   TransportStats stats;
   EXPECT_TRUE(transport_controller_->GetStats("audio", &stats));
   EXPECT_EQ("audio", stats.transport_name);
   EXPECT_EQ(2U, stats.channel_stats.size());
 }
 
 // Test that transport gets destroyed when it has no more channels.
 TEST_F(TransportControllerTest, TestCreateAndDestroyChannel) {
-  FakeDtlsTransport* channel1 = CreateChannel("audio", 1);
+  FakeTransportChannel* channel1 = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel1);
-  FakeDtlsTransport* channel2 = CreateChannel("audio", 1);
+  FakeTransportChannel* channel2 = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel2);
   ASSERT_EQ(channel1, channel2);
-  FakeDtlsTransport* channel3 = CreateChannel("audio", 2);
+  FakeTransportChannel* channel3 = CreateChannel("audio", 2);
   ASSERT_NE(nullptr, channel3);
 
   // Using GetStats to check if transport is destroyed from an outside class's
   // perspective.
   TransportStats stats;
   EXPECT_TRUE(transport_controller_->GetStats("audio", &stats));
   DestroyChannel("audio", 2);
   DestroyChannel("audio", 1);
   EXPECT_TRUE(transport_controller_->GetStats("audio", &stats));
   DestroyChannel("audio", 1);
   EXPECT_FALSE(transport_controller_->GetStats("audio", &stats));
 }
 
 TEST_F(TransportControllerTest, TestSignalConnectionStateFailed) {
   // Need controlling ICE role to get in failed state.
   transport_controller_->SetIceRole(ICEROLE_CONTROLLING);
-  FakeDtlsTransport* channel1 = CreateChannel("audio", 1);
+  FakeTransportChannel* channel1 = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel1);
-  FakeDtlsTransport* channel2 = CreateChannel("video", 1);
+  FakeTransportChannel* channel2 = CreateChannel("video", 1);
   ASSERT_NE(nullptr, channel2);
 
   // Should signal "failed" if any channel failed; channel is considered failed
   // if it previously had a connection but now has none, and gathering is
   // complete.
   channel1->SetCandidatesGatheringComplete();
   channel1->SetConnectionCount(1);
   channel1->SetConnectionCount(0);
   EXPECT_EQ_WAIT(kIceConnectionFailed, connection_state_, kTimeout);
   EXPECT_EQ(1, connection_state_signal_count_);
 }
 
 TEST_F(TransportControllerTest, TestSignalConnectionStateConnected) {
   transport_controller_->SetIceRole(ICEROLE_CONTROLLING);
-  FakeDtlsTransport* channel1 = CreateChannel("audio", 1);
+  FakeTransportChannel* channel1 = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel1);
-  FakeDtlsTransport* channel2 = CreateChannel("video", 1);
+  FakeTransportChannel* channel2 = CreateChannel("video", 1);
   ASSERT_NE(nullptr, channel2);
-  FakeDtlsTransport* channel3 = CreateChannel("video", 2);
+  FakeTransportChannel* channel3 = CreateChannel("video", 2);
   ASSERT_NE(nullptr, channel3);
 
   // First, have one channel connect, and another fail, to ensure that
   // the first channel connecting didn't trigger a "connected" state signal.
   // We should only get a signal when all are connected.
   channel1->SetConnectionCount(2);
   channel1->SetWritable(true);
   channel3->SetCandidatesGatheringComplete();
   channel3->SetConnectionCount(1);
   channel3->SetConnectionCount(0);
   EXPECT_EQ_WAIT(kIceConnectionFailed, connection_state_, kTimeout);
   // Signal count of 1 means that the only signal emitted was "failed".
   EXPECT_EQ(1, connection_state_signal_count_);
 
   // Destroy the failed channel to return to "connecting" state.
   DestroyChannel("video", 2);
   EXPECT_EQ_WAIT(kIceConnectionConnecting, connection_state_, kTimeout);
   EXPECT_EQ(2, connection_state_signal_count_);
 
   // Make the remaining channel reach a connected state.
   channel2->SetConnectionCount(2);
   channel2->SetWritable(true);
   EXPECT_EQ_WAIT(kIceConnectionConnected, connection_state_, kTimeout);
   EXPECT_EQ(3, connection_state_signal_count_);
 }
 
 TEST_F(TransportControllerTest, TestSignalConnectionStateComplete) {
   transport_controller_->SetIceRole(ICEROLE_CONTROLLING);
-  FakeDtlsTransport* channel1 = CreateChannel("audio", 1);
+  FakeTransportChannel* channel1 = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel1);
-  FakeDtlsTransport* channel2 = CreateChannel("video", 1);
+  FakeTransportChannel* channel2 = CreateChannel("video", 1);
   ASSERT_NE(nullptr, channel2);
-  FakeDtlsTransport* channel3 = CreateChannel("video", 2);
+  FakeTransportChannel* channel3 = CreateChannel("video", 2);
   ASSERT_NE(nullptr, channel3);
 
   // Similar to above test, but we're now reaching the completed state, which
-  // means only one connection per FakeDtlsTransport.
+  // means only one connection per FakeTransportChannel.
   channel1->SetCandidatesGatheringComplete();
   channel1->SetConnectionCount(1);
   channel1->SetWritable(true);
   channel3->SetCandidatesGatheringComplete();
   channel3->SetConnectionCount(1);
   channel3->SetConnectionCount(0);
   EXPECT_EQ_WAIT(kIceConnectionFailed, connection_state_, kTimeout);
   // Signal count of 1 means that the only signal emitted was "failed".
   EXPECT_EQ(1, connection_state_signal_count_);
 
@@ skipping 11 matching lines @@
 
   // Finally, transition to completed state.
   channel2->SetConnectionCount(1);
   EXPECT_EQ_WAIT(kIceConnectionCompleted, connection_state_, kTimeout);
   EXPECT_EQ(4, connection_state_signal_count_);
 }
 
 // Make sure that if we're "connected" and remove a transport, we stay in the
 // "connected" state.
 TEST_F(TransportControllerTest, TestDestroyTransportAndStayConnected) {
-  FakeDtlsTransport* channel1 = CreateChannel("audio", 1);
+  FakeTransportChannel* channel1 = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel1);
-  FakeDtlsTransport* channel2 = CreateChannel("video", 1);
+  FakeTransportChannel* channel2 = CreateChannel("video", 1);
   ASSERT_NE(nullptr, channel2);
 
   channel1->SetCandidatesGatheringComplete();
   channel1->SetConnectionCount(2);
   channel1->SetWritable(true);
   channel2->SetCandidatesGatheringComplete();
   channel2->SetConnectionCount(2);
   channel2->SetWritable(true);
   EXPECT_EQ_WAIT(kIceConnectionConnected, connection_state_, kTimeout);
   EXPECT_EQ(1, connection_state_signal_count_);
 
   // Destroy one channel, then "complete" the other one, so we reach
   // a known state.
   DestroyChannel("video", 1);
   channel1->SetConnectionCount(1);
   EXPECT_EQ_WAIT(kIceConnectionCompleted, connection_state_, kTimeout);
   // Signal count of 2 means the deletion didn't cause any unexpected signals
   EXPECT_EQ(2, connection_state_signal_count_);
 }
 
 // If we destroy the last/only transport, we should simply transition to
 // "connecting".
 TEST_F(TransportControllerTest, TestDestroyLastTransportWhileConnected) {
-  FakeDtlsTransport* channel = CreateChannel("audio", 1);
+  FakeTransportChannel* channel = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel);
 
   channel->SetCandidatesGatheringComplete();
   channel->SetConnectionCount(2);
   channel->SetWritable(true);
   EXPECT_EQ_WAIT(kIceConnectionConnected, connection_state_, kTimeout);
   EXPECT_EQ(1, connection_state_signal_count_);
 
   DestroyChannel("audio", 1);
   EXPECT_EQ_WAIT(kIceConnectionConnecting, connection_state_, kTimeout);
   // Signal count of 2 means the deletion didn't cause any unexpected signals
   EXPECT_EQ(2, connection_state_signal_count_);
 }
 
 TEST_F(TransportControllerTest, TestSignalReceiving) {
-  FakeDtlsTransport* channel1 = CreateChannel("audio", 1);
+  FakeTransportChannel* channel1 = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel1);
-  FakeDtlsTransport* channel2 = CreateChannel("video", 1);
+  FakeTransportChannel* channel2 = CreateChannel("video", 1);
   ASSERT_NE(nullptr, channel2);
 
   // Should signal receiving as soon as any channel is receiving.
   channel1->SetReceiving(true);
   EXPECT_TRUE_WAIT(receiving_, kTimeout);
   EXPECT_EQ(1, receiving_signal_count_);
 
   channel2->SetReceiving(true);
   channel1->SetReceiving(false);
   channel2->SetReceiving(false);
   EXPECT_TRUE_WAIT(!receiving_, kTimeout);
   EXPECT_EQ(2, receiving_signal_count_);
 }
 
 TEST_F(TransportControllerTest, TestSignalGatheringStateGathering) {
-  FakeDtlsTransport* channel = CreateChannel("audio", 1);
+  FakeTransportChannel* channel = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel);
-  channel->ice_transport()->MaybeStartGathering();
+  channel->MaybeStartGathering();
   // Should be in the gathering state as soon as any transport starts gathering.
   EXPECT_EQ_WAIT(kIceGatheringGathering, gathering_state_, kTimeout);
   EXPECT_EQ(1, gathering_state_signal_count_);
 }
 
 TEST_F(TransportControllerTest, TestSignalGatheringStateComplete) {
-  FakeDtlsTransport* channel1 = CreateChannel("audio", 1);
+  FakeTransportChannel* channel1 = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel1);
-  FakeDtlsTransport* channel2 = CreateChannel("video", 1);
+  FakeTransportChannel* channel2 = CreateChannel("video", 1);
   ASSERT_NE(nullptr, channel2);
-  FakeDtlsTransport* channel3 = CreateChannel("data", 1);
+  FakeTransportChannel* channel3 = CreateChannel("data", 1);
   ASSERT_NE(nullptr, channel3);
 
-  channel3->ice_transport()->MaybeStartGathering();
+  channel3->MaybeStartGathering();
   EXPECT_EQ_WAIT(kIceGatheringGathering, gathering_state_, kTimeout);
   EXPECT_EQ(1, gathering_state_signal_count_);
 
   // Have one channel finish gathering, then destroy it, to make sure gathering
   // completion wasn't signalled if only one transport finished gathering.
   channel3->SetCandidatesGatheringComplete();
   DestroyChannel("data", 1);
   EXPECT_EQ_WAIT(kIceGatheringNew, gathering_state_, kTimeout);
   EXPECT_EQ(2, gathering_state_signal_count_);
 
   // Make remaining channels start and then finish gathering.
-  channel1->ice_transport()->MaybeStartGathering();
-  channel2->ice_transport()->MaybeStartGathering();
+  channel1->MaybeStartGathering();
+  channel2->MaybeStartGathering();
   EXPECT_EQ_WAIT(kIceGatheringGathering, gathering_state_, kTimeout);
   EXPECT_EQ(3, gathering_state_signal_count_);
 
   channel1->SetCandidatesGatheringComplete();
   channel2->SetCandidatesGatheringComplete();
   EXPECT_EQ_WAIT(kIceGatheringComplete, gathering_state_, kTimeout);
   EXPECT_EQ(4, gathering_state_signal_count_);
 }
 
 // Test that when the last transport that hasn't finished connecting and/or
 // gathering is destroyed, the aggregate state jumps to "completed". This can
 // happen if, for example, we have an audio and video transport, the audio
 // transport completes, then we start bundling video on the audio transport.
 TEST_F(TransportControllerTest,
        TestSignalingWhenLastIncompleteTransportDestroyed) {
   transport_controller_->SetIceRole(ICEROLE_CONTROLLING);
-  FakeDtlsTransport* channel1 = CreateChannel("audio", 1);
+  FakeTransportChannel* channel1 = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel1);
-  FakeDtlsTransport* channel2 = CreateChannel("video", 1);
+  FakeTransportChannel* channel2 = CreateChannel("video", 1);
   ASSERT_NE(nullptr, channel2);
 
   channel1->SetCandidatesGatheringComplete();
   EXPECT_EQ_WAIT(kIceGatheringGathering, gathering_state_, kTimeout);
   EXPECT_EQ(1, gathering_state_signal_count_);
 
   channel1->SetConnectionCount(1);
   channel1->SetWritable(true);
   DestroyChannel("video", 1);
   EXPECT_EQ_WAIT(kIceConnectionCompleted, connection_state_, kTimeout);
   EXPECT_EQ(1, connection_state_signal_count_);
   EXPECT_EQ_WAIT(kIceGatheringComplete, gathering_state_, kTimeout);
   EXPECT_EQ(2, gathering_state_signal_count_);
 }
 
 TEST_F(TransportControllerTest, TestSignalCandidatesGathered) {
-  FakeDtlsTransport* channel = CreateChannel("audio", 1);
+  FakeTransportChannel* channel = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel);
 
   // Transport won't signal candidates until it has a local description.
   TransportDescription local_desc(std::vector<std::string>(), kIceUfrag1,
                                   kIcePwd1, ICEMODE_FULL,
                                   CONNECTIONROLE_ACTPASS, nullptr);
   std::string err;
   EXPECT_TRUE(transport_controller_->SetLocalTransportDescription(
       "audio", local_desc, CA_OFFER, &err));
   transport_controller_->MaybeStartGathering();
 
-  channel->ice_transport()->SignalCandidateGathered(channel->ice_transport(),
-                                                    CreateCandidate(1));
+  channel->SignalCandidateGathered(channel, CreateCandidate(1));
   EXPECT_EQ_WAIT(1, candidates_signal_count_, kTimeout);
   EXPECT_EQ(1U, candidates_["audio"].size());
 }
 
 TEST_F(TransportControllerTest, TestSignalingOccursOnSignalingThread) {
   CreateTransportControllerWithNetworkThread();
   CreateChannelsAndCompleteConnectionOnNetworkThread();
 
   // connecting --> connected --> completed
   EXPECT_EQ_WAIT(kIceConnectionCompleted, connection_state_, kTimeout);
@@ skipping 13 matching lines @@
   EXPECT_TRUE(!signaled_on_non_signaling_thread_);
 }
 
 // Older versions of Chrome expect the ICE role to be re-determined when an
 // ICE restart occurs, and also don't perform conflict resolution correctly,
 // so for now we can't safely stop doing this.
 // See: https://bugs.chromium.org/p/chromium/issues/detail?id=628676
 // TODO(deadbeef): Remove this when these old versions of Chrome reach a low
 // enough population.
 TEST_F(TransportControllerTest, IceRoleRedeterminedOnIceRestartByDefault) {
-  FakeDtlsTransport* channel = CreateChannel("audio", 1);
+  FakeTransportChannel* channel = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel);
   std::string err;
   // Do an initial offer answer, so that the next offer is an ICE restart.
   transport_controller_->SetIceRole(ICEROLE_CONTROLLED);
   TransportDescription remote_desc(std::vector<std::string>(), kIceUfrag1,
                                    kIcePwd1, ICEMODE_FULL,
                                    CONNECTIONROLE_ACTPASS, nullptr);
   EXPECT_TRUE(transport_controller_->SetRemoteTransportDescription(
       "audio", remote_desc, CA_OFFER, &err));
   TransportDescription local_desc(std::vector<std::string>(), kIceUfrag2,
@@ skipping 12 matching lines @@
       "audio", ice_restart_desc, CA_OFFER, &err));
   EXPECT_EQ(ICEROLE_CONTROLLING, channel->GetIceRole());
 }
 
 // Test that if the TransportController was created with the
 // |redetermine_role_on_ice_restart| parameter set to false, the role is *not*
 // redetermined on an ICE restart.
 TEST_F(TransportControllerTest, IceRoleNotRedetermined) {
   bool redetermine_role = false;
   transport_controller_.reset(new TransportControllerForTest(redetermine_role));
-  FakeDtlsTransport* channel = CreateChannel("audio", 1);
+  FakeTransportChannel* channel = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel);
   std::string err;
   // Do an initial offer answer, so that the next offer is an ICE restart.
   transport_controller_->SetIceRole(ICEROLE_CONTROLLED);
   TransportDescription remote_desc(std::vector<std::string>(), kIceUfrag1,
                                    kIcePwd1, ICEMODE_FULL,
                                    CONNECTIONROLE_ACTPASS, nullptr);
   EXPECT_TRUE(transport_controller_->SetRemoteTransportDescription(
       "audio", remote_desc, CA_OFFER, &err));
   TransportDescription local_desc(std::vector<std::string>(), kIceUfrag2,
                                   kIcePwd2, ICEMODE_FULL,
                                   CONNECTIONROLE_ACTPASS, nullptr);
   EXPECT_TRUE(transport_controller_->SetLocalTransportDescription(
       "audio", local_desc, CA_ANSWER, &err));
   EXPECT_EQ(ICEROLE_CONTROLLED, channel->GetIceRole());
 
   // The endpoint that initiated an ICE restart should keep the existing role.
   TransportDescription ice_restart_desc(std::vector<std::string>(), kIceUfrag3,
                                         kIcePwd3, ICEMODE_FULL,
                                         CONNECTIONROLE_ACTPASS, nullptr);
   EXPECT_TRUE(transport_controller_->SetLocalTransportDescription(
       "audio", ice_restart_desc, CA_OFFER, &err));
   EXPECT_EQ(ICEROLE_CONTROLLED, channel->GetIceRole());
 }
 
 // Tests channel role is reversed after receiving ice-lite from remote.
 TEST_F(TransportControllerTest, TestSetRemoteIceLiteInOffer) {
-  FakeDtlsTransport* channel = CreateChannel("audio", 1);
+  FakeTransportChannel* channel = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel);
   std::string err;
 
   transport_controller_->SetIceRole(ICEROLE_CONTROLLED);
   TransportDescription remote_desc(std::vector<std::string>(), kIceUfrag1,
                                    kIcePwd1, ICEMODE_LITE,
                                    CONNECTIONROLE_ACTPASS, nullptr);
   EXPECT_TRUE(transport_controller_->SetRemoteTransportDescription(
       "audio", remote_desc, CA_OFFER, &err));
   TransportDescription local_desc(kIceUfrag1, kIcePwd1);
   ASSERT_TRUE(transport_controller_->SetLocalTransportDescription(
       "audio", local_desc, CA_ANSWER, nullptr));
 
   EXPECT_EQ(ICEROLE_CONTROLLING, channel->GetIceRole());
   EXPECT_EQ(ICEMODE_LITE, channel->remote_ice_mode());
 }
 
 // Tests ice-lite in remote answer.
 TEST_F(TransportControllerTest, TestSetRemoteIceLiteInAnswer) {
-  FakeDtlsTransport* channel = CreateChannel("audio", 1);
+  FakeTransportChannel* channel = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel);
   std::string err;
 
   transport_controller_->SetIceRole(ICEROLE_CONTROLLING);
   TransportDescription local_desc(kIceUfrag1, kIcePwd1);
   ASSERT_TRUE(transport_controller_->SetLocalTransportDescription(
       "audio", local_desc, CA_OFFER, nullptr));
   EXPECT_EQ(ICEROLE_CONTROLLING, channel->GetIceRole());
   // Channels will be created in ICEFULL_MODE.
   EXPECT_EQ(ICEMODE_FULL, channel->remote_ice_mode());
@@ skipping 43 matching lines @@
   ASSERT_TRUE(transport_controller_->SetLocalTransportDescription(
       "audio", ice_restart_local_desc, CA_OFFER, nullptr));
   ASSERT_TRUE(transport_controller_->SetLocalTransportDescription(
       "video", local_desc, CA_OFFER, nullptr));
   // NeedsIceRestart should still be true for video.
   EXPECT_FALSE(transport_controller_->NeedsIceRestart("audio"));
   EXPECT_TRUE(transport_controller_->NeedsIceRestart("video"));
 }
 
 }  // namespace cricket {