Adding "adapter" ORTC objects on top of ChannelManager/BaseChannel/etc.

webrtc/pc/webrtcsession_unittest.cc

Index: webrtc/pc/webrtcsession_unittest.cc
diff --git a/webrtc/pc/webrtcsession_unittest.cc b/webrtc/pc/webrtcsession_unittest.cc
index efd5d0c870f907038e0512d32c4fd8b4d7d7e66d..0e306ff88763613bbbc3d4e619ba0a8963341373 100644
--- a/webrtc/pc/webrtcsession_unittest.cc
+++ b/webrtc/pc/webrtcsession_unittest.cc
@@ -34,7 +34,7 @@
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/engine/fakewebrtccall.h"
 #include "webrtc/media/sctp/sctptransportinternal.h"
-#include "webrtc/p2p/base/packettransportinterface.h"
+#include "webrtc/p2p/base/packettransportinternal.h"
 #include "webrtc/p2p/base/stunserver.h"
 #include "webrtc/p2p/base/teststunserver.h"
 #include "webrtc/p2p/base/testturnserver.h"
@@ -212,7 +212,7 @@ class MockIceObserver : public webrtc::IceObserver {
 // local/remote ports.
 class FakeSctpTransport : public cricket::SctpTransportInternal {
  public:
-  void SetTransportChannel(rtc::PacketTransportInterface* channel) override {}
+  void SetTransportChannel(rtc::PacketTransportInternal* channel) override {}
   bool Start(int local_port, int remote_port) override {
     local_port_ = local_port;
     remote_port_ = remote_port;
@@ -239,7 +239,7 @@ class FakeSctpTransport : public cricket::SctpTransportInternal {
 class FakeSctpTransportFactory : public cricket::SctpTransportInternalFactory {
  public:
   std::unique_ptr<cricket::SctpTransportInternal> CreateSctpTransport(
-      rtc::PacketTransportInterface*) override {
+      rtc::PacketTransportInternal*) override {
     last_fake_sctp_transport_ = new FakeSctpTransport();
     return std::unique_ptr<cricket::SctpTransportInternal>(
         last_fake_sctp_transport_);
@@ -277,24 +277,24 @@ class WebRtcSessionForTest : public webrtc::WebRtcSession {
 
   // Note that these methods are only safe to use if the signaling thread
   // is the same as the worker thread
-  rtc::PacketTransportInterface* voice_rtp_transport_channel() {
+  rtc::PacketTransportInternal* voice_rtp_transport_channel() {
     return rtp_transport_channel(voice_channel());
   }
 
-  rtc::PacketTransportInterface* voice_rtcp_transport_channel() {
+  rtc::PacketTransportInternal* voice_rtcp_transport_channel() {
     return rtcp_transport_channel(voice_channel());
   }
 
-  rtc::PacketTransportInterface* video_rtp_transport_channel() {
+  rtc::PacketTransportInternal* video_rtp_transport_channel() {
     return rtp_transport_channel(video_channel());
   }
 
-  rtc::PacketTransportInterface* video_rtcp_transport_channel() {
+  rtc::PacketTransportInternal* video_rtcp_transport_channel() {
     return rtcp_transport_channel(video_channel());
   }
 
  private:
-  rtc::PacketTransportInterface* rtp_transport_channel(
+  rtc::PacketTransportInternal* rtp_transport_channel(
       cricket::BaseChannel* ch) {
     if (!ch) {
       return nullptr;
@@ -302,7 +302,7 @@ class WebRtcSessionForTest : public webrtc::WebRtcSession {
     return ch->rtp_dtls_transport();
   }
 
-  rtc::PacketTransportInterface* rtcp_transport_channel(
+  rtc::PacketTransportInternal* rtcp_transport_channel(
       cricket::BaseChannel* ch) {
     if (!ch) {
       return nullptr;
@@ -371,9 +371,10 @@ class WebRtcSessionTest
   WebRtcSessionTest()
       : media_engine_(new cricket::FakeMediaEngine()),
         data_engine_(new cricket::FakeDataEngine()),
-        channel_manager_(new cricket::ChannelManager(media_engine_,
-                                                     data_engine_,
-                                                     rtc::Thread::Current())),
+        channel_manager_(new cricket::ChannelManager(
+            std::unique_ptr<cricket::MediaEngineInterface>(media_engine_),
+            std::unique_ptr<cricket::DataEngineInterface>(data_engine_),
+            rtc::Thread::Current())),
         fake_call_(webrtc::Call::Config(&event_log_)),
         media_controller_(
             webrtc::MediaControllerInterface::Create(cricket::MediaConfig(),
@@ -1533,6 +1534,8 @@ class WebRtcSessionTest
   }
 
   webrtc::RtcEventLogNullImpl event_log_;
+  // |media_engine_| and |data_engine_| are actually owned by
+  // |channel_manager_|.
   cricket::FakeMediaEngine* media_engine_;
   cricket::FakeDataEngine* data_engine_;
   // Actually owned by session_.
@@ -2473,13 +2476,13 @@ TEST_F(WebRtcSessionTest, TestChannelCreationsWithContentNames) {
   SessionDescriptionInterface* answer = CreateAnswer();
   SetLocalDescriptionWithoutError(answer);
 
-  rtc::PacketTransportInterface* voice_transport_channel =
+  rtc::PacketTransportInternal* voice_transport_channel =
       session_->voice_rtp_transport_channel();
   EXPECT_TRUE(voice_transport_channel != NULL);
   EXPECT_EQ(voice_transport_channel->debug_name(),
             "audio_content_name " +
                 std::to_string(cricket::ICE_CANDIDATE_COMPONENT_RTP));
-  rtc::PacketTransportInterface* video_transport_channel =
+  rtc::PacketTransportInternal* video_transport_channel =
       session_->video_rtp_transport_channel();
   ASSERT_TRUE(video_transport_channel != NULL);
   EXPECT_EQ(video_transport_channel->debug_name(),