Simplify interface for media/cast: CastTransportSenderImpl

media/cast/net/cast_transport_sender_impl.h

Index: media/cast/net/cast_transport_sender_impl.h
diff --git a/media/cast/net/cast_transport_sender_impl.h b/media/cast/net/cast_transport_sender_impl.h
index 09b42999175cbaedad7b09515d9ba2485ae75397..d9af1ec6d6fed88129c0f88ed9fc86579bf77ef2 100644
--- a/media/cast/net/cast_transport_sender_impl.h
+++ b/media/cast/net/cast_transport_sender_impl.h
@@ -78,16 +78,9 @@ class CastTransportSenderImpl : public CastTransportSender {
   // TODO(hubbe): Too many callbacks, replace with an interface.
   // http://crbug.com/557477
   CastTransportSenderImpl(
-      net::NetLog* net_log,
+      base::WeakPtr<CastTransportSenderInfo> cast_transport_sender_info,
       base::TickClock* clock,
-      const net::IPEndPoint& local_end_point,
-      const net::IPEndPoint& remote_end_point,
-      scoped_ptr<base::DictionaryValue> options,
-      const CastTransportStatusCallback& status_callback,
-      const BulkRawEventsCallback& raw_events_callback,
-      base::TimeDelta raw_events_callback_interval,
       const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner,
-      const PacketReceiverCallback& packet_callback,
       PacketSender* external_transport);
 
   ~CastTransportSenderImpl() final;
@@ -156,8 +149,8 @@ class CastTransportSenderImpl : public CastTransportSender {
                              const RtcpCastMessageCallback& cast_message_cb,
                              const RtcpCastMessage& cast_message);
 
+  base::WeakPtr<CastTransportSenderInfo> cast_transport_sender_info_;
   base::TickClock* clock_;  // Not owned by this class.
-  CastTransportStatusCallback status_callback_;
   scoped_refptr<base::SingleThreadTaskRunner> transport_task_runner_;
 
   // FrameEvents and PacketEvents pending delivery via |raw_events_callback_|.
@@ -186,7 +179,6 @@ class CastTransportSenderImpl : public CastTransportSender {
   TransportEncryptionHandler audio_encryptor_;
   TransportEncryptionHandler video_encryptor_;
 
-  BulkRawEventsCallback raw_events_callback_;
   base::TimeDelta raw_events_callback_interval_;
 
   // Right after a frame is sent we record the number of bytes sent to the
@@ -197,10 +189,6 @@ class CastTransportSenderImpl : public CastTransportSender {
   // Packets that don't match these ssrcs are ignored.
   std::set<uint32> valid_ssrcs_;
 
-  // Called with incoming packets. (Unless they match the
-  // channels created by Initialize{Audio,Video}.
-  PacketReceiverCallback packet_callback_;
-
   scoped_ptr<net::ScopedWifiOptions> wifi_options_autoreset_;
 
   base::WeakPtrFactory<CastTransportSenderImpl> weak_factory_;