Move back receiver VCM into ViEChannel.

webrtc/video/video_receive_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 77 matching lines @@
   const VideoReceiveStream::Config config_;
   ProcessThread* const process_thread_;
   Clock* const clock_;
 
   rtc::PlatformThread decode_thread_;
 
   CongestionController* const congestion_controller_;
   CallStats* const call_stats_;
   VieRemb* const remb_;
 
-  rtc::scoped_ptr<VideoCodingModule> vcm_;
   IncomingVideoStream incoming_video_stream_;
   ReceiveStatisticsProxy stats_proxy_;
   ViEChannel vie_channel_;
   ViEReceiver* const vie_receiver_;
+  VideoCodingModule* const vcm_;
   RtpRtcp* const rtp_rtcp_;
 };
 }  // namespace internal
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_