Refactor: simplify interface of SenderRtcpSession and CastTransport.

media/cast/sender/frame_sender.h

Index: media/cast/sender/frame_sender.h
diff --git a/media/cast/sender/frame_sender.h b/media/cast/sender/frame_sender.h
index 7a58abaa9e387e3b2020a535d8330d05c7b741c6..4b5263392a9aa04173cf49562b42aa6ee6dcdd20 100644
--- a/media/cast/sender/frame_sender.h
+++ b/media/cast/sender/frame_sender.h
@@ -62,10 +62,28 @@ class FrameSender {
   virtual base::TimeDelta GetInFlightMediaDuration() const = 0;
 
  protected:
+  class RtcpObserver : public SenderRtcpObserver {
+   public:
+    explicit RtcpObserver(base::WeakPtr<FrameSender> frame_sender);
+    ~RtcpObserver() override;
+
+    void OnCastMessageReceived(const RtcpCastMessage& cast_message) override;
+    void OnRttReceived(base::TimeDelta round_trip_time) override;
+    void OnPliReceived() override;
+
+   private:
+    const base::WeakPtr<FrameSender> frame_sender_;
+  };
   // Schedule and execute periodic sending of RTCP report.
   void ScheduleNextRtcpReport();
   void SendRtcpReport(bool schedule_future_reports);
 
+  // Protected for testability.
+  void OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback);
+
+  // Called when a Pli message is received.
+  void OnReceivedPli();
+
   void OnMeasuredRoundTripTime(base::TimeDelta rtt);
 
   const scoped_refptr<CastEnvironment> cast_environment_;
@@ -89,12 +107,6 @@ class FrameSender {
   void ResendCheck();
   void ResendForKickstart();
 
-  // Protected for testability.
-  void OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback);
-
-  // Called when a Pli message is received.
-  void OnReceivedPli();
-
   // Returns true if too many frames would be in-flight by encoding and sending
   // the next frame having the given |frame_duration|.
   bool ShouldDropNextFrame(base::TimeDelta frame_duration) const;