Use vcm::VideoSender in ViEEncoder.

webrtc/video/video_send_stream.h

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 21 matching lines @@
 
 class BitrateAllocator;
 class CallStats;
 class CongestionController;
 class ProcessThread;
 class RtpRtcp;
 class ViEChannel;
 class ViEEncoder;
 class VieRemb;
 
+namespace vcm {
+class VideoSender;
+}  // namespace vcm
+
 namespace internal {
 
 class VideoSendStream : public webrtc::VideoSendStream,
                         public webrtc::CpuOveruseObserver,
                         public webrtc::BitrateAllocatorObserver,
                         public webrtc::VCMProtectionCallback {
  public:
   VideoSendStream(int num_cpu_cores,
                   ProcessThread* module_process_thread,
                   CallStats* call_stats,
@@ skipping 63 matching lines @@
   rtc::PlatformThread encoder_thread_;
   rtc::Event encoder_wakeup_event_;
   volatile int stop_encoder_thread_;
   rtc::CriticalSection encoder_settings_crit_;
   rtc::Optional<EncoderSettings> pending_encoder_settings_
       GUARDED_BY(encoder_settings_crit_);
 
   OveruseFrameDetector overuse_detector_;
   EncoderStateFeedback encoder_feedback_;
   ViEEncoder vie_encoder_;
-  VideoCodingModule* const vcm_;
+  vcm::VideoSender* const video_sender_;
 
   const std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_;
   // RtpRtcp modules, declared here as they use other members on construction.
   const std::vector<RtpRtcp*> rtp_rtcp_modules_;
   PayloadRouter payload_router_;
   VideoCaptureInput input_;
 };
 }  // namespace internal
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_