Revert of make the DtlsTransportWrapper inherit form DtlsTransportInternal

webrtc/media/sctp/sctptransport_unittest.cc

Index: webrtc/media/sctp/sctptransport_unittest.cc
diff --git a/webrtc/media/sctp/sctptransport_unittest.cc b/webrtc/media/sctp/sctptransport_unittest.cc
index 2f34240fd6e113b02b33b129390e8a05d656ed2a..42e4dc646f37f1a646bcb101b727bf901df01682 100644
--- a/webrtc/media/sctp/sctptransport_unittest.cc
+++ b/webrtc/media/sctp/sctptransport_unittest.cc
@@ -130,8 +130,8 @@
   static void SetUpTestCase() {}
 
   void SetupConnectedTransportsWithTwoStreams() {
-    fake_dtls1_.reset(new FakeDtlsTransport("fake dtls 1", 0));
-    fake_dtls2_.reset(new FakeDtlsTransport("fake dtls 2", 0));
+    fake_dtls1_.reset(new FakeTransportChannel("fake dtls 1", 0));
+    fake_dtls2_.reset(new FakeTransportChannel("fake dtls 2", 0));
     recv1_.reset(new SctpFakeDataReceiver());
     recv2_.reset(new SctpFakeDataReceiver());
     transport1_.reset(CreateTransport(fake_dtls1_.get(), recv1_.get()));
@@ -164,7 +164,7 @@
     return ret;
   }
 
-  SctpTransport* CreateTransport(FakeDtlsTransport* fake_dtls,
+  SctpTransport* CreateTransport(FakeTransportChannel* fake_dtls,
                                  SctpFakeDataReceiver* recv) {
     SctpTransport* transport =
         new SctpTransport(rtc::Thread::Current(), fake_dtls);
@@ -207,8 +207,8 @@
   SctpTransport* transport2() { return transport2_.get(); }
   SctpFakeDataReceiver* receiver1() { return recv1_.get(); }
   SctpFakeDataReceiver* receiver2() { return recv2_.get(); }
-  FakeDtlsTransport* fake_dtls1() { return fake_dtls1_.get(); }
-  FakeDtlsTransport* fake_dtls2() { return fake_dtls2_.get(); }
+  FakeTransportChannel* fake_dtls1() { return fake_dtls1_.get(); }
+  FakeTransportChannel* fake_dtls2() { return fake_dtls2_.get(); }
 
   int transport1_ready_to_send_count() {
     return transport1_ready_to_send_count_;
@@ -218,8 +218,8 @@
   }
 
  private:
-  std::unique_ptr<FakeDtlsTransport> fake_dtls1_;
-  std::unique_ptr<FakeDtlsTransport> fake_dtls2_;
+  std::unique_ptr<FakeTransportChannel> fake_dtls1_;
+  std::unique_ptr<FakeTransportChannel> fake_dtls2_;
   std::unique_ptr<SctpFakeDataReceiver> recv1_;
   std::unique_ptr<SctpFakeDataReceiver> recv2_;
   std::unique_ptr<SctpTransport> transport1_;
@@ -236,9 +236,9 @@
 // transport channel (which is unwritable), and then switches to another
 // channel. A common scenario due to how BUNDLE works.
 TEST_F(SctpTransportTest, SwitchTransportChannel) {
-  FakeDtlsTransport black_hole("black hole", 0);
-  FakeDtlsTransport fake_dtls1("fake dtls 1", 0);
-  FakeDtlsTransport fake_dtls2("fake dtls 2", 0);
+  FakeTransportChannel black_hole("black hole", 0);
+  FakeTransportChannel fake_dtls1("fake dtls 1", 0);
+  FakeTransportChannel fake_dtls2("fake dtls 2", 0);
   SctpFakeDataReceiver recv1;
   SctpFakeDataReceiver recv2;
 
@@ -294,8 +294,8 @@
 // A value of -1 for the local/remote port should be treated as the default
 // (5000).
 TEST_F(SctpTransportTest, NegativeOnePortTreatedAsDefault) {
-  FakeDtlsTransport fake_dtls1("fake dtls 1", 0);
-  FakeDtlsTransport fake_dtls2("fake dtls 2", 0);
+  FakeTransportChannel fake_dtls1("fake dtls 1", 0);
+  FakeTransportChannel fake_dtls2("fake dtls 2", 0);
   SctpFakeDataReceiver recv1;
   SctpFakeDataReceiver recv2;
   std::unique_ptr<SctpTransport> transport1(
@@ -325,7 +325,7 @@
 }
 
 TEST_F(SctpTransportTest, OpenStreamWithAlreadyOpenedStreamFails) {
-  FakeDtlsTransport fake_dtls("fake dtls", 0);
+  FakeTransportChannel fake_dtls("fake dtls", 0);
   SctpFakeDataReceiver recv;
   std::unique_ptr<SctpTransport> transport(CreateTransport(&fake_dtls, &recv));
   EXPECT_TRUE(transport->OpenStream(1));
@@ -333,7 +333,7 @@
 }
 
 TEST_F(SctpTransportTest, ResetStreamWithAlreadyResetStreamFails) {
-  FakeDtlsTransport fake_dtls("fake dtls", 0);
+  FakeTransportChannel fake_dtls("fake dtls", 0);
   SctpFakeDataReceiver recv;
   std::unique_ptr<SctpTransport> transport(CreateTransport(&fake_dtls, &recv));
   EXPECT_TRUE(transport->OpenStream(1));
@@ -344,7 +344,7 @@
 // Test that SignalReadyToSendData is fired after Start has been called and the
 // DTLS channel is writable.
 TEST_F(SctpTransportTest, SignalReadyToSendDataAfterDtlsWritable) {
-  FakeDtlsTransport fake_dtls("fake dtls", 0);
+  FakeTransportChannel fake_dtls("fake dtls", 0);
   SctpFakeDataReceiver recv;
   std::unique_ptr<SctpTransport> transport(CreateTransport(&fake_dtls, &recv));