Remove the dependency of TransportChannel and TransportChannelImpl.

webrtc/pc/channel_unittest.cc

Index: webrtc/pc/channel_unittest.cc
diff --git a/webrtc/pc/channel_unittest.cc b/webrtc/pc/channel_unittest.cc
index 589ebd54d17342648a26f4b93187a0588643256d..1f93f682d6a89e0f8ff5343c172d3e735d782cfb 100644
--- a/webrtc/pc/channel_unittest.cc
+++ b/webrtc/pc/channel_unittest.cc
@@ -20,8 +20,8 @@
 #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)                    \
@@ -34,9 +34,9 @@ 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);
@@ -271,21 +271,21 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
     return channel1_->RemoveRecvStream(id);
   }
 
-  std::vector<cricket::TransportChannelImpl*> GetChannels1() {
+  std::vector<cricket::DtlsTransportInternal*> GetChannels1() {
     return transport_controller1_->channels_for_testing();
   }
 
-  std::vector<cricket::TransportChannelImpl*> GetChannels2() {
+  std::vector<cricket::DtlsTransportInternal*> GetChannels2() {
     return transport_controller2_->channels_for_testing();
   }
 
-  cricket::FakeTransportChannel* GetFakeChannel1(int component) {
-    return transport_controller1_->GetFakeTransportChannel_n(
+  cricket::FakeDtlsTransport* GetFakeChannel1(int component) {
+    return transport_controller1_->GetFakeDtlsTransport_n(
         channel1_->content_name(), component);
   }
 
-  cricket::FakeTransportChannel* GetFakeChannel2(int component) {
-    return transport_controller2_->GetFakeTransportChannel_n(
+  cricket::FakeDtlsTransport* GetFakeChannel2(int component) {
+    return transport_controller2_->GetFakeDtlsTransport_n(
         channel2_->content_name(), component);
   }
 
@@ -931,7 +931,7 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
 
     CreateChannels(0, 0);
 
-    cricket::TransportChannel* transport_channel1 =
+    cricket::DtlsTransportInternal* transport_channel1 =
         channel1_->transport_channel();
     ASSERT_TRUE(transport_channel1);
     typename T::MediaChannel* media_channel1 =
@@ -941,8 +941,8 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
     media_channel1->set_num_network_route_changes(0);
     network_thread_->Invoke<void>(RTC_FROM_HERE, [transport_channel1] {
       // The transport channel becomes disconnected.
-      transport_channel1->SignalSelectedCandidatePairChanged(
-          transport_channel1, nullptr, -1, false);
+      transport_channel1->ice_transport()->SignalSelectedCandidatePairChanged(
+          transport_channel1->ice_transport(), nullptr, -1, false);
     });
     WaitForThreads();
     EXPECT_EQ(1, media_channel1->num_network_route_changes());
@@ -958,8 +958,9 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
       std::unique_ptr<cricket::CandidatePairInterface> candidate_pair(
           transport_controller1_->CreateFakeCandidatePair(
               local_address, kLocalNetId, remote_address, kRemoteNetId));
-      transport_channel1->SignalSelectedCandidatePairChanged(
-          transport_channel1, candidate_pair.get(), kLastPacketId, true);
+      transport_channel1->ice_transport()->SignalSelectedCandidatePairChanged(
+          transport_channel1->ice_transport(), candidate_pair.get(),
+          kLastPacketId, true);
     });
     WaitForThreads();
     EXPECT_EQ(1, media_channel1->num_network_route_changes());
@@ -1495,6 +1496,7 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
     WaitForThreads();
     EXPECT_TRUE(CheckRtp1());
     EXPECT_TRUE(CheckNoRtp2());
+    EXPECT_TRUE(CheckNoRtp1());
 
     // Gain writability back
     network_thread_->Invoke<void>(RTC_FROM_HERE, [this] {
@@ -1804,7 +1806,7 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
     error_handler.mode_ = cricket::SrtpFilter::UNPROTECT;
 
     network_thread_->Invoke<void>(RTC_FROM_HERE, [this] {
-      cricket::TransportChannel* transport_channel =
+      cricket::DtlsTransportInternal* transport_channel =
           channel2_->transport_channel();
       transport_channel->SignalReadPacket(
           transport_channel, reinterpret_cast<const char*>(kBadPacket),
@@ -1818,8 +1820,8 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
 
   void TestOnReadyToSend() {
     CreateChannels(RTCP, RTCP);
-    TransportChannel* rtp = channel1_->transport_channel();
-    TransportChannel* rtcp = channel1_->rtcp_transport_channel();
+    DtlsTransportInternal* rtp = channel1_->transport_channel();
+    DtlsTransportInternal* rtcp = channel1_->rtcp_transport_channel();
     EXPECT_FALSE(media_channel1_->ready_to_send());
 
     network_thread_->Invoke<void>(RTC_FROM_HERE,
@@ -1870,7 +1872,7 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
     EXPECT_TRUE(channel1_->SetLocalContent(&content, CA_OFFER, NULL));
     EXPECT_TRUE(channel1_->SetRemoteContent(&content, CA_ANSWER, NULL));
     EXPECT_TRUE(channel1_->rtcp_transport_channel() == NULL);
-    TransportChannel* rtp = channel1_->transport_channel();
+    DtlsTransportInternal* rtp = channel1_->transport_channel();
     EXPECT_FALSE(media_channel1_->ready_to_send());
     // In the case of rtcp mux, the SignalReadyToSend() from rtp channel
     // should trigger the MediaChannel's OnReadyToSend.