Move Ownership of RtpModules to VideoSendStream.

webrtc/video/encoder_state_feedback.h

Index: webrtc/video/encoder_state_feedback.h
diff --git a/webrtc/video/encoder_state_feedback.h b/webrtc/video/encoder_state_feedback.h
index 6326bed9c13cdb7d966619b3634039768f54af8e..57595a0a69a1055f04286f39560ab78d9bce26a8 100644
--- a/webrtc/video/encoder_state_feedback.h
+++ b/webrtc/video/encoder_state_feedback.h
@@ -31,12 +31,6 @@ class EncoderStateFeedback : public RtcpIntraFrameObserver {
   // Adds an encoder to receive feedback for a set of SSRCs.
   void Init(const std::vector<uint32_t>& ssrc, ViEEncoder* encoder);
 
-  // Removes the registered encoder. Necessary since RTP modules outlive
-  // ViEEncoder.
-  // TODO(pbos): Make sure RTP modules are not running when tearing down
-  // ViEEncoder, then remove this function.
-  void TearDown();
-
   void OnReceivedIntraFrameRequest(uint32_t ssrc) override;
   void OnReceivedSLI(uint32_t ssrc, uint8_t picture_id) override;
   void OnReceivedRPSI(uint32_t ssrc, uint64_t picture_id) override;