Refactor: simplify interface of SenderRtcpSession and CastTransport.

media/cast/net/cast_transport_impl.h

Index: media/cast/net/cast_transport_impl.h
diff --git a/media/cast/net/cast_transport_impl.h b/media/cast/net/cast_transport_impl.h
index fdf9b94eae59ba4be285e1043a65a6bf511b3abc..7c6cb226b6dab08b5eaa35f8a7b59e9a5ff7bb1a 100644
--- a/media/cast/net/cast_transport_impl.h
+++ b/media/cast/net/cast_transport_impl.h
@@ -33,7 +33,6 @@
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
@@ -58,21 +57,17 @@ class CastTransportImpl final : public CastTransport {
   CastTransportImpl(
       base::TickClock* clock,  // Owned by the caller.
       base::TimeDelta logging_flush_interval,
-      scoped_ptr<Client> client,
-      scoped_ptr<PacketTransport> transport,
+      std::unique_ptr<Client> client,
+      std::unique_ptr<PacketTransport> transport,
       const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner);
 
   ~CastTransportImpl() final;
 
   // CastTransport implementation for sending.
   void InitializeAudio(const CastTransportRtpConfig& config,
-                       const RtcpCastMessageCallback& cast_message_cb,
-                       const RtcpRttCallback& rtt_cb,
-                       const RtcpPliCallback& pli_cb) final;
+                       std::unique_ptr<RtpSenderRtcpClient> rtcp_client) final;
   void InitializeVideo(const CastTransportRtpConfig& config,
-                       const RtcpCastMessageCallback& cast_message_cb,
-                       const RtcpRttCallback& rtt_cb,
-                       const RtcpPliCallback& pli_cb) final;
+                       std::unique_ptr<RtpSenderRtcpClient> rtcp_client) final;
   void InsertFrame(uint32_t ssrc, const EncodedFrame& frame) final;
 
   void SendSenderReport(uint32_t ssrc,
@@ -116,6 +111,14 @@ class CastTransportImpl final : public CastTransport {
       const RtcpReportBlock& rtp_receiver_report_block) final;
   void SendRtcpFromRtpReceiver() final;
 
+  // Called when a log message is received.
+  void OnReceivedLogMessage(EventMediaType media_type,

[miu, 2016/04/15 23:14:39]

These don't need to be made public.  (See my comments for
Audio/Video/FrameSender below for details on how to do this.)

[xjz, 2016/04/20 01:09:03]

Done.

+                            const RtcpReceiverLogMessage& log);
+
+  // Called when a RTCP Cast message is received.
+  void OnReceivedCastMessage(uint32_t ssrc,
+                             const RtcpCastMessage& cast_message);
+
  private:
   FRIEND_TEST_ALL_PREFIXES(CastTransportImplTest, NacksCancelRetransmits);
   FRIEND_TEST_ALL_PREFIXES(CastTransportImplTest, CancelRetransmits);
@@ -136,21 +139,12 @@ class CastTransportImpl final : public CastTransport {
   void SendRawEvents();
 
   // Called when a packet is received.
-  bool OnReceivedPacket(scoped_ptr<Packet> packet);
-
-  // Called when a log message is received.
-  void OnReceivedLogMessage(EventMediaType media_type,
-                            const RtcpReceiverLogMessage& log);
-
-  // Called when a RTCP Cast message is received.
-  void OnReceivedCastMessage(uint32_t ssrc,
-                             const RtcpCastMessageCallback& cast_message_cb,
-                             const RtcpCastMessage& cast_message);
+  bool OnReceivedPacket(std::unique_ptr<Packet> packet);
 
   base::TickClock* const clock_;  // Not owned by this class.
   const base::TimeDelta logging_flush_interval_;
-  const scoped_ptr<Client> transport_client_;
-  const scoped_ptr<PacketTransport> transport_;
+  const std::unique_ptr<Client> transport_client_;
+  const std::unique_ptr<PacketTransport> transport_;
   const scoped_refptr<base::SingleThreadTaskRunner> transport_task_runner_;
 
   // FrameEvents and PacketEvents pending delivery via raw events callback.
@@ -163,12 +157,12 @@ class CastTransportImpl final : public CastTransport {
   PacedSender pacer_;
 
   // Packetizer for audio and video frames.
-  scoped_ptr<RtpSender> audio_sender_;
-  scoped_ptr<RtpSender> video_sender_;
+  std::unique_ptr<RtpSender> audio_sender_;
+  std::unique_ptr<RtpSender> video_sender_;
 
   // Maintains RTCP session for audio and video.
-  scoped_ptr<SenderRtcpSession> audio_rtcp_session_;
-  scoped_ptr<SenderRtcpSession> video_rtcp_session_;
+  std::unique_ptr<SenderRtcpSession> audio_rtcp_session_;
+  std::unique_ptr<SenderRtcpSession> video_rtcp_session_;
 
   // Encrypts data in EncodedFrames before they are sent.  Note that it's
   // important for the encryption to happen here, in code that would execute in
@@ -188,14 +182,14 @@ class CastTransportImpl final : public CastTransport {
   // While non-null, global WiFi behavior modifications are in effect. This is
   // used, for example, to turn off WiFi scanning that tends to interfere with
   // the reliability of UDP packet transmission.
-  scoped_ptr<net::ScopedWifiOptions> wifi_options_autoreset_;
+  std::unique_ptr<net::ScopedWifiOptions> wifi_options_autoreset_;
 
   // Do not initialize the |rtcp_builder_at_rtp_receiver_| if the RTP receiver
   // SSRC does not match these ssrcs. Only RTP receiver needs to register its
   // SSRC in this set.
   std::set<uint32_t> valid_rtp_receiver_ssrcs_;
 
-  scoped_ptr<RtcpBuilder> rtcp_builder_at_rtp_receiver_;
+  std::unique_ptr<RtcpBuilder> rtcp_builder_at_rtp_receiver_;
 
   base::WeakPtrFactory<CastTransportImpl> weak_factory_;