Cast: Clean up injection of transport into PacedPacketSender

media/cast/transport/pacing/paced_sender.h

 // Copyright 2013 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_PACING_PACED_SENDER_H_
 #define MEDIA_CAST_TRANSPORT_PACING_PACED_SENDER_H_
 
 #include <list>
 #include <vector>
 
@@ skipping 22 matching lines @@
 
   virtual bool SendRtcpPacket(const Packet& packet) = 0;
 
   virtual ~PacedPacketSender() {}
 };
 
 class PacedSender : public PacedPacketSender,
                     public base::NonThreadSafe,
                     public base::SupportsWeakPtr<PacedSender> {
  public:
-  // The |external_transport| should only be used by the Cast receiver and for
-  // testing.
   PacedSender(base::TickClock* clock,
-              const CastTransportConfig* const config,
-              PacketSender* external_transport,
-              const scoped_refptr<base::TaskRunner>& transport_task_runner,
-              const CastTransportStatusCallback& status_callback);
+              PacketSender* transport,
+              const scoped_refptr<base::TaskRunner>& transport_task_runner);
 
   virtual ~PacedSender();
 
   // PacedPacketSender implementation.
-  virtual void SetPacketReceiver(const PacketReceiverCallback& packet_receiver);
-
   virtual bool SendPackets(const PacketList& packets) OVERRIDE;
 
   virtual bool ResendPackets(const PacketList& packets) OVERRIDE;
 
   virtual bool SendRtcpPacket(const Packet& packet) OVERRIDE;
 
-  void InsertFakeTransportForTesting(PacketSender* fake_transport);
-
  protected:
   // Schedule a delayed task on the main cast thread when it's time to send the
   // next packet burst.
   void ScheduleNextSend();
 
   // Process any pending packets in the queue(s).
   void SendNextPacketBurst();
 
  private:
   bool SendPacketsToTransport(const PacketList& packets,
                               PacketList* packets_not_sent);
 
-  // Actually sends the packets to the transport. When set, packets will be sent
-  // to the external transport.
+  // Actually sends the packets to the transport.
   bool TransmitPackets(const PacketList& packets);
   void SendStoredPackets();
   void UpdateBurstSize(size_t num_of_packets);
 
   // Not owned by this class.
   base::TickClock* const clock_;
-  scoped_ptr<UdpTransport> transport_;
-  PacketSender* external_transport_;  // Not owned by this class.
-  const CastTransportConfig* const config_;  // Not owned by this class.
+  PacketSender* transport_;  // Not owned by this class.
   scoped_refptr<base::TaskRunner> transport_task_runner_;
 
   size_t burst_size_;
   size_t packets_sent_in_burst_;
   base::TimeTicks time_last_process_;
   // Note: We can't combine the |packet_list_| and the |resend_packet_list_|
   // since then we might get reordering of the retransmitted packets.
   PacketList packet_list_;
   PacketList resend_packet_list_;
 
   base::WeakPtrFactory<PacedSender> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PacedSender);
 };
 
 }  // namespace transport
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_TRANSPORT_PACING_PACED_SENDER_H_