[Cast] Cleanup: Remove TransportXXXXXSender, an unnecessary layer of indirection.

media/cast/transport/cast_transport_sender_impl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_IMPL_H_
 #define MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_IMPL_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "media/cast/logging/logging_defines.h"
 #include "media/cast/logging/simple_event_subscriber.h"
 #include "media/cast/transport/cast_transport_config.h"
 #include "media/cast/transport/cast_transport_sender.h"
 #include "media/cast/transport/pacing/paced_sender.h"
 #include "media/cast/transport/rtcp/rtcp_builder.h"
-#include "media/cast/transport/transport_audio_sender.h"
-#include "media/cast/transport/transport_video_sender.h"
+#include "media/cast/transport/rtp_sender/rtp_sender.h"
 
 namespace media {
 namespace cast {
 namespace transport {
 
 class CastTransportSenderImpl : public CastTransportSender {
  public:
   // external_transport is only used for testing.
   // Note that SetPacketReceiver does not work if an external
   // transport is provided.
@@ skipping 43 matching lines @@
   void SendRawEvents();
 
   base::TickClock* clock_;  // Not owned by this class.
   CastTransportStatusCallback status_callback_;
   scoped_refptr<base::SingleThreadTaskRunner> transport_task_runner_;
 
   scoped_ptr<UdpTransport> transport_;
   LoggingImpl logging_;
   PacedSender pacer_;
   RtcpBuilder rtcp_builder_;
-  scoped_ptr<TransportAudioSender> audio_sender_;
-  scoped_ptr<TransportVideoSender> video_sender_;
+  scoped_ptr<RtpSender> audio_sender_;
+  scoped_ptr<RtpSender> video_sender_;
 
   // This is non-null iff |raw_events_callback_| is non-null.
   scoped_ptr<SimpleEventSubscriber> event_subscriber_;
   base::RepeatingTimer<CastTransportSenderImpl> raw_events_timer_;
 
   BulkRawEventsCallback raw_events_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(CastTransportSenderImpl);
 };
 
 }  // namespace transport
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_IMPL_H_