Modernize and cleanup ChannelManager

Bug: None
Change-Id: Ifd07c10dc1d3655e0138900c9a9897810cec3d54
Reviewed-on: https://webrtc-review.googlesource.com/18080
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Peter Thatcher <pthatcher@webrtc.org>
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20593}
diff --git a/pc/rtpsenderreceiver_unittest.cc b/pc/rtpsenderreceiver_unittest.cc
index f29b416..f40b494 100644
--- a/pc/rtpsenderreceiver_unittest.cc
+++ b/pc/rtpsenderreceiver_unittest.cc
@@ -13,6 +13,7 @@
 #include <utility>
 
 #include "media/base/fakemediaengine.h"
+#include "media/base/rtpdataengine.h"
 #include "media/engine/fakewebrtccall.h"
 #include "pc/audiotrack.h"
 #include "pc/channelmanager.h"
@@ -56,10 +57,10 @@
       :  // Create fake media engine/etc. so we can create channels to use to
          // test RtpSenders/RtpReceivers.
         media_engine_(new cricket::FakeMediaEngine()),
-        channel_manager_(
-            std::unique_ptr<cricket::MediaEngineInterface>(media_engine_),
-            rtc::Thread::Current(),
-            rtc::Thread::Current()),
+        channel_manager_(rtc::WrapUnique(media_engine_),
+                         rtc::MakeUnique<cricket::RtpDataEngine>(),
+                         rtc::Thread::Current(),
+                         rtc::Thread::Current()),
         fake_call_(Call::Config(&event_log_)),
         local_stream_(MediaStream::Create(kStreamLabel1)) {
     // Create channels to be used by the RtpSenders and RtpReceivers.