Move simple RtpRtcp calls to VideoSendStream.

webrtc/video/video_send_stream.h

Index: webrtc/video/video_send_stream.h
diff --git a/webrtc/video/video_send_stream.h b/webrtc/video/video_send_stream.h
index faabd333607b592019d718932d50be79838b4f47..beaf659a2c94c34cee6d6b98dc34ef126bad5810 100644
--- a/webrtc/video/video_send_stream.h
+++ b/webrtc/video/video_send_stream.h
@@ -17,7 +17,6 @@
 #include "webrtc/call.h"
 #include "webrtc/call/transport_adapter.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/video/encoded_frame_callback_adapter.h"
 #include "webrtc/video/encoder_state_feedback.h"
 #include "webrtc/video/payload_router.h"
@@ -34,6 +33,7 @@ class BitrateAllocator;
 class CallStats;
 class CongestionController;
 class ProcessThread;
+class RtpRtcp;
 class ViEChannel;
 class ViEEncoder;
 class VieRemb;
@@ -99,6 +99,10 @@ class VideoSendStream : public webrtc::VideoSendStream,
   EncoderStateFeedback encoder_feedback_;
   ViEChannel vie_channel_;
   ViEReceiver* const vie_receiver_;
+  // TODO(pbos): Move RtpRtcp ownership to VideoSendStream.
+  // RtpRtcp modules, currently owned by ViEChannel but ownership should
+  // eventually move here.
+  const std::vector<RtpRtcp*> rtp_rtcp_modules_;
   VideoCaptureInput input_;
 };
 }  // namespace internal