Untangle ViEChannel and ViEEncoder.

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 e2911cc10332aba9f4167aad82264b9b6acb88e8..2f6f101b05c9b6a1b489c2dba62b83ae107d3036 100644
--- a/webrtc/video/video_send_stream.h
+++ b/webrtc/video/video_send_stream.h
@@ -19,6 +19,7 @@
 #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/payload_router.h"
 #include "webrtc/video/send_statistics_proxy.h"
 #include "webrtc/video/video_capture_input.h"
 #include "webrtc/video_receive_stream.h"
@@ -82,13 +83,16 @@ class VideoSendStream : public webrtc::VideoSendStream,
   VideoEncoderConfig encoder_config_;
   std::map<uint32_t, RtpState> suspended_ssrcs_;
 
-  ProcessThread* const module_process_thread_;
   CallStats* const call_stats_;
   CongestionController* const congestion_controller_;
 
   rtc::scoped_ptr<VideoCaptureInput> input_;
-  rtc::scoped_ptr<ViEChannel> vie_channel_;
+  PayloadRouter payload_router_;
   rtc::scoped_ptr<ViEEncoder> vie_encoder_;
+  rtc::scoped_ptr<ViEChannel> vie_channel_;
+  // TODO(pbos): Make proper const.
+  // const after construction.
+  VideoCodingModule* vcm_;
   rtc::scoped_ptr<EncoderStateFeedback> encoder_feedback_;
 
   // Used as a workaround to indicate that we should be using the configured