Cast: Clean up injection of transport into PacedPacketSender

media/cast/transport/cast_transport_sender_impl.cc

Index: media/cast/transport/cast_transport_sender_impl.cc
diff --git a/media/cast/transport/cast_transport_sender_impl.cc b/media/cast/transport/cast_transport_sender_impl.cc
index 0f1285eabc2f3484a1b7605eb309c68bd27b0f6d..3c23ad06ef7209a40f3b050d2b20eaffccf93b85 100644
--- a/media/cast/transport/cast_transport_sender_impl.cc
+++ b/media/cast/transport/cast_transport_sender_impl.cc
@@ -17,16 +17,27 @@ CastTransportSender* CastTransportSender::CreateCastTransportSender(
     const CastTransportConfig& config,
     const CastTransportStatusCallback& status_callback,
     const scoped_refptr<base::TaskRunner>& transport_task_runner) {
-  return new CastTransportSenderImpl(clock, config, status_callback,
-                                     transport_task_runner.get());
+  return new CastTransportSenderImpl(clock,
+                                     config,
+                                     status_callback,
+                                     transport_task_runner.get(),
+                                     NULL);
 }
 
 CastTransportSenderImpl::CastTransportSenderImpl(
     base::TickClock* clock,
     const CastTransportConfig& config,
     const CastTransportStatusCallback& status_callback,
-    const scoped_refptr<base::TaskRunner>& transport_task_runner)
-    : pacer_(clock, &config, NULL, transport_task_runner, status_callback),
+    const scoped_refptr<base::TaskRunner>& transport_task_runner,
+    PacketSender* external_transport)
+    : transport_(external_transport ? NULL :
+                 new UdpTransport(transport_task_runner,
+                                  config.local_endpoint,
+                                  config.receiver_endpoint,
+                                  status_callback)),
+      pacer_(clock,
+             external_transport ? external_transport : transport_.get(),
+             transport_task_runner),
       rtcp_builder_(&pacer_),
       audio_sender_(config, clock, &pacer_),
       video_sender_(config, clock, &pacer_) {
@@ -42,7 +53,7 @@ CastTransportSenderImpl::~CastTransportSenderImpl() {
 
 void CastTransportSenderImpl::SetPacketReceiver(
     const PacketReceiverCallback& packet_receiver) {
-  pacer_.SetPacketReceiver(packet_receiver);
+  transport_->StartReceiving(packet_receiver);
 }
 
 void CastTransportSenderImpl::InsertCodedAudioFrame(
@@ -93,11 +104,6 @@ void CastTransportSenderImpl::RtpVideoStatistics(
   video_sender_.GetStatistics(now, sender_info);
 }
 
-void CastTransportSenderImpl::InsertFakeTransportForTesting(
-    PacketSender* fake_transport) {
-  pacer_.InsertFakeTransportForTesting(fake_transport);
-}
-
 }  // namespace transport
 }  // namespace cast
 }  // namespace media